David S. Miller 902455e007 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/core/rtnetlink.c net/core/skbuff.c Both conflicts were very simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-06-11 16:02:55 -07:00
..
Kconfig	mac80211: process the CSA frame for mesh accordingly	2013-10-28 15:05:28 +01:00
Makefile	mac80211: move TDLS code to another file	2014-05-05 15:56:15 +02:00
aes_ccm.c	mac80211: remove VLAIS usage from mac80211	2014-04-09 10:55:27 +02:00
aes_ccm.h	mac80211: port CCMP to cryptoapi's CCM driver	2013-10-11 15:38:20 +02:00
aes_cmac.c	mac80211: fix checkpatch errors	2013-12-18 10:33:06 +01:00
aes_cmac.h	mac80211: fix checkpatch errors	2013-12-18 10:33:06 +01:00
agg-rx.c	mac80211: improve aggregation debug messages	2013-01-18 21:55:15 +01:00
agg-tx.c	mac80211: send {ADD,DEL}BA on AC_VO like other mgmt frames, as per spec	2014-02-04 21:48:28 +01:00
cfg.c	mac80211: export the expected throughput	2014-05-21 09:15:16 +02:00
cfg.h	mac80211: make cfg80211 ops and privid const	2014-02-04 21:48:21 +01:00
chan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-05-22 13:58:36 -04:00
debug.h	mac80211: process the CSA frame for mesh accordingly	2013-10-28 15:05:28 +01:00
debugfs.c	mac80211: use RCU_INIT_POINTER	2014-04-09 10:55:30 +02:00
debugfs.h	mac80211: fix some missing includes	2014-04-09 14:49:43 +02:00
debugfs_key.c	mac80211: move sdata debugfs dir to vif	2013-03-18 20:10:04 +01:00
debugfs_key.h	…
debugfs_netdev.c	mac80211: don't check netdev state for debugfs read/write	2014-05-28 16:22:48 +02:00
debugfs_netdev.h	mac80211: fix some missing includes	2014-04-09 14:49:43 +02:00
debugfs_sta.c	mac80211: fix agg_status debugfs file write	2014-02-04 21:48:19 +01:00
debugfs_sta.h	…
driver-ops.h	mac80211: add a single-transaction driver op to switch contexts	2014-05-26 11:04:41 +02:00
event.c	…
ht.c	mac80211: Allow HT capa override to add 40 MHz intolerant	2014-04-22 17:23:19 +02:00
ibss.c	mac80211: fix IBSS join by initializing last_scan_completed	2014-05-27 08:54:01 +02:00
ieee80211_i.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-05-27 13:47:27 -04:00
iface.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-11 16:02:55 -07:00
key.c	mac80211: remove BUG_ON usage	2014-04-29 17:59:27 +02:00
key.h	mac80211: free all AP/VLAN keys at once	2013-12-16 11:29:48 +01:00
led.c	mac80211: use oneshot blink API for LED triggers	2013-08-01 10:48:49 +02:00
led.h	mac80211: use oneshot blink API for LED triggers	2013-08-01 10:48:49 +02:00
main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-05-22 13:58:36 -04:00
mesh.c	mac80211: Support multiple CSA counters	2014-05-15 15:00:58 +02:00
mesh.h	mac80211: use put_unaligned_le in mesh when necessary	2013-11-25 20:51:55 +01:00
mesh_hwmp.c	mac80211: mesh: always use the latest target_sn	2014-04-22 17:24:50 +02:00
mesh_pathtbl.c	mac80211: remove BUG_ON usage	2014-04-29 17:59:27 +02:00
mesh_plink.c	mac80211: enable WME for peer mesh STA	2014-01-06 17:43:06 +01:00
mesh_ps.c	mac80211: clear sequence/fragment number in QoS-null frames	2014-03-05 15:49:54 +01:00
mesh_sync.c	mac80211: remove BUG_ON usage	2014-04-29 17:59:27 +02:00
michael.c	…
michael.h	mac80211: fix some missing includes	2014-04-09 14:49:43 +02:00
mlme.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-05-27 13:47:27 -04:00
offchannel.c	mac80211: fix on-channel remain-on-channel	2014-05-14 15:48:38 +02:00
pm.c	mac80211: fix suspend vs. authentication race	2014-03-19 21:29:53 +01:00
rate.c	mac80211: remove module handling from rate control ops	2014-02-04 21:48:26 +01:00
rate.h	mac80211: make rate control ops const	2014-02-04 21:48:21 +01:00
rc80211_minstrel.c	mac80211: export the expected throughput	2014-05-21 09:15:16 +02:00
rc80211_minstrel.h	mac80211: make rate control ops const	2014-02-04 21:48:21 +01:00
rc80211_minstrel_debugfs.c	mac80211: cosmetics for minstrel_debugfs	2013-04-17 17:08:23 +02:00
rc80211_minstrel_ht.c	mac80211: export the expected throughput	2014-05-21 09:15:16 +02:00
rc80211_minstrel_ht.h	mac80211/minstrel_ht: use the new rate control API	2013-04-22 16:16:41 +02:00
rc80211_minstrel_ht_debugfs.c	mac80211: minstrel_ht: replace some occurences of MCS_GROUP_RATES	2013-11-25 20:52:07 +01:00
rc80211_pid.h	…
rc80211_pid_algo.c	mac80211: make rate control ops const	2014-02-04 21:48:21 +01:00
rc80211_pid_debugfs.c	mac80211: fix some snprintf misuses	2013-10-01 12:16:51 +02:00
rx.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-05-13 15:27:44 -04:00
scan.c	mac80211: handle failed restart/resume better	2014-05-09 12:21:34 +02:00
spectmgmt.c	mac80211: fix the mesh channel switch support	2013-11-25 16:50:13 +01:00
sta_info.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-05-29 12:55:38 -04:00
sta_info.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
status.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-05-29 12:55:38 -04:00
tdls.c	cfg80211: constify MAC addresses in cfg80211 ops	2014-05-19 17:34:42 +02:00
tkip.c	mac80211: fix checkpatch errors	2013-12-18 10:33:06 +01:00
tkip.h	…
trace.c	…
trace.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-05-29 12:55:38 -04:00
tx.c	mac80211: Handle the CSA counters correctly	2014-05-15 15:01:00 +02:00
util.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-05-22 13:58:36 -04:00
vht.c	mac80211: allow VHT with peers not capable of 40MHz	2014-05-09 09:56:53 +02:00
wep.c	wireless: move crypto constants to ieee80211.h	2013-05-16 22:39:41 +02:00
wep.h	…
wme.c	mac80211: send control port protocol frames to the VO queue	2014-02-12 11:26:43 +01:00
wme.h	…
wpa.c	mac80211: add option to generate CCMP IVs only for mgmt frames	2014-04-25 17:26:15 +02:00
wpa.h	mac80211: add generic cipher scheme support	2013-11-25 20:50:52 +01:00