linux/net/mac80211
David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-17 22:08:28 -05:00
..
aes_ccm.c
aes_ccm.h
aes_cmac.c mac80211: remove ieee80211_aes_cmac_calculate_k1_k2() 2015-08-13 11:31:45 +02:00
aes_cmac.h
aes_gcm.c
aes_gcm.h
aes_gmac.c
aes_gmac.h
agg-rx.c mac80211: allow the driver to advertise A-MSDU within A-MPDU Rx support 2015-09-22 15:21:24 +02:00
agg-tx.c mac80211: always set the buf_size in AddBA req to 64 2015-11-20 11:39:40 +01:00
cfg.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-17 22:08:28 -05:00
chan.c mac80211: upgrade BW of TDLS peers when possible 2015-07-17 15:38:12 +02:00
debug.h
debugfs_key.c mac80211: allow writing TX PN in debugfs 2015-09-29 15:56:50 +02:00
debugfs_key.h
debugfs_netdev.c mac80211: remove last_beacon/ave_beacon debugfs files 2015-09-22 15:21:25 +02:00
debugfs_netdev.h
debugfs_sta.c mac80211: move station statistics into sub-structs 2015-10-21 10:08:22 +02:00
debugfs_sta.h
debugfs.c mac80211: allow driver to prevent two stations w/ same address 2015-12-04 14:43:32 +01:00
debugfs.h
driver-ops.c mac80211: document sleep requirements for channel context ops 2015-11-03 11:15:48 +01:00
driver-ops.h mac80211: document sleep requirements for channel context ops 2015-11-03 11:15:48 +01:00
ethtool.c mac80211: move station statistics into sub-structs 2015-10-21 10:08:22 +02:00
ht.c
ibss.c mac80211: Allow a STA to join an IBSS with 80+80 MHz channel 2015-12-04 14:43:32 +01:00
ieee80211_i.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-17 22:08:28 -05:00
iface.c mac80211: don't teardown sdata on sdata stop 2015-12-02 22:27:27 +01:00
Kconfig mac80211: use DECLARE_EWMA 2015-08-14 17:49:53 +02:00
key.c mac80211: add atomic uploaded keys iterator 2015-12-04 14:43:32 +01:00
key.h mac80211: remove key TX/RX counter 2015-07-17 15:38:01 +02:00
led.c
led.h
main.c mac80211: rewrite remain-on-channel logic 2015-12-04 14:43:32 +01:00
Makefile mac80211: remove event.c 2015-10-14 18:40:26 +02:00
mesh_hwmp.c mac80211: move station statistics into sub-structs 2015-10-21 10:08:22 +02:00
mesh_pathtbl.c mac80211: mesh: print MAC address instead of pointer 2015-12-04 14:43:32 +01:00
mesh_plink.c mac80211: fix crash on mesh local link ID generation with VIFs 2015-11-03 10:43:40 +01:00
mesh_ps.c mac80211: mesh: separate plid and aid concepts 2015-07-17 15:47:11 +02:00
mesh_sync.c mac80211: move mesh related station fields to own struct 2015-07-17 15:38:06 +02:00
mesh.c mac80211: TDLS: add proper HT-oper IE 2015-11-03 10:42:47 +01:00
mesh.h mac80211: make ieee80211_new_mesh_header return unsigned 2015-10-05 17:54:16 +02:00
michael.c
michael.h
mlme.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-17 22:08:28 -05:00
ocb.c mac80211: move station statistics into sub-structs 2015-10-21 10:08:22 +02:00
offchannel.c mac80211: handle HW ROC expired properly 2015-12-07 11:06:37 +01:00
pm.c mac80211: don't reconfigure sched scan in case of wowlan 2015-11-03 10:42:05 +01:00
rate.c mac80211: further improve "no supported rates" warning 2015-11-03 10:56:42 +01:00
rate.h mac80211: deinline rate_control_rate_init, rate_control_rate_update 2015-07-17 15:50:02 +02:00
rc80211_minstrel_debugfs.c mac80211: minstrel[_ht]: remove non-ascii debugfs characters 2015-09-29 15:56:47 +02:00
rc80211_minstrel_ht_debugfs.c mac80211: minstrel[_ht]: remove non-ascii debugfs characters 2015-09-29 15:56:47 +02:00
rc80211_minstrel_ht.c mac80211: minstrel_ht: handle peers in dynamic SMPS 2015-07-17 15:38:20 +02:00
rc80211_minstrel_ht.h
rc80211_minstrel.c mac80211: fix invalid read in minstrel_sort_best_tp_rates() 2015-08-13 13:52:34 +02:00
rc80211_minstrel.h
rx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-17 22:08:28 -05:00
scan.c mac80211: do not actively scan DFS channels 2015-12-02 22:27:53 +01:00
spectmgmt.c
sta_info.c mac80211: add atomic uploaded keys iterator 2015-12-04 14:43:32 +01:00
sta_info.h mac80211: add atomic uploaded keys iterator 2015-12-04 14:43:32 +01:00
status.c Here's another set of patches for the current cycle: 2015-10-22 07:28:41 -07:00
tdls.c mac80211: TDLS: add proper HT-oper IE 2015-11-03 10:42:47 +01:00
tkip.c
tkip.h
trace_msg.h
trace.c
trace.h mac80211: allow the driver to send EOSP when needed 2015-12-04 14:43:32 +01:00
tx.c mac80211: properly free TX skbs when monitor TX fails 2015-12-04 14:43:32 +01:00
util.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-17 22:08:28 -05:00
vht.c mac80211: handle width changes from opmode notification IE in beacon 2015-12-15 13:16:47 +01:00
wep.c
wep.h
wme.c
wme.h
wpa.c mac80211: remove event.c 2015-10-14 18:40:26 +02:00
wpa.h