iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7424ce6506
linux/net/mac80211
History
David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ieee802154/fakehard.c

A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.

Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-21 22:28:24 -05:00
..
aes_ccm.c mac80211: Fix regression that triggers a kernel BUG with CCMP 2014-11-06 12:42:22 +01:00
aes_ccm.h
aes_cmac.c
aes_cmac.h
agg-rx.c mac80211: fix offloaded BA session traffic after hw restart 2014-09-03 13:40:38 +02:00
agg-tx.c mac80211: synchronously reserve TID per station 2014-11-19 18:45:36 +01:00
cfg.c mac80211: introduce TDLS channel switch ops 2014-11-19 18:45:21 +01:00
cfg.h mac80211: make cfg80211 ops and privid const 2014-02-04 21:48:21 +01:00
chan.c mac80211: 802.11p OCB mode support 2014-11-04 13:18:21 +01:00
debug.h mac80211: 802.11p OCB mode support 2014-11-04 13:18:21 +01:00
debugfs_key.c mac80211: remove unnecessary null test before debugfs_remove() 2014-10-21 21:08:10 +02:00
debugfs_key.h
debugfs_netdev.c mac80211: replace SMPS hw flags with wiphy feature bits 2014-09-11 13:37:02 +02:00
debugfs_netdev.h mac80211: fix some missing includes 2014-04-09 14:49:43 +02:00
debugfs_sta.c mac80211: introduce TDLS channel switch ops 2014-11-19 18:45:21 +01:00
debugfs_sta.h
debugfs.c mac80211: replace SMPS hw flags with wiphy feature bits 2014-09-11 13:37:02 +02:00
debugfs.h mac80211: fix some missing includes 2014-04-09 14:49:43 +02:00
driver-ops.h mac80211: notify drivers on sta rate table changes 2014-11-19 19:15:50 +01:00
ethtool.c cfg80211: make ethtool the driver's responsibility 2014-06-23 11:05:33 +02:00
event.c
ht.c mac80211: set Rx highest rate in ht_cap 2014-07-21 12:14:04 +02:00
ibss.c mac80211: use secondary channel offset IE also beacons during CSA 2014-10-29 16:37:45 +01:00
ieee80211_i.h It has been a while since my last pull request, so we accumulated 2014-11-20 16:09:30 -05:00
iface.c It has been a while since my last pull request, so we accumulated 2014-11-20 16:09:30 -05:00
Kconfig mac80211: 802.11p OCB mode support 2014-11-04 13:18:21 +01:00
key.c mac80211: don't remove tainted keys after not programming 2014-10-22 11:30:30 +02:00
key.h
led.c
led.h
main.c mac80211: add TDLS channel-switch Rx flow 2014-11-19 18:45:26 +01:00
Makefile mac80211: 802.11p OCB mode support 2014-11-04 13:18:21 +01:00
mesh_hwmp.c mac80211: remove unnecessary break after return 2014-07-15 16:27:00 -07:00
mesh_pathtbl.c mac80211: implement cfg80211_ops to query mesh proxy path table 2014-10-09 11:19:07 +02:00
mesh_plink.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2014-09-08 11:14:56 -04: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
mesh.c mac80211: use secondary channel offset IE also beacons during CSA 2014-10-29 16:37:45 +01:00
mesh.h mac80211: implement cfg80211_ops to query mesh proxy path table 2014-10-09 11:19:07 +02:00
michael.c
michael.h mac80211: fix some missing includes 2014-04-09 14:49:43 +02:00
mlme.c It has been a while since my last pull request, so we accumulated 2014-11-20 16:09:30 -05:00
ocb.c mac80211: 802.11p OCB mode support 2014-11-04 13:18:21 +01:00
offchannel.c mac80211: introduce refcount for queue_stop_reasons 2014-06-23 14:22:25 +02:00
pm.c mac80211: introduce refcount for queue_stop_reasons 2014-06-23 14:22:25 +02:00
rate.c mac80211: notify drivers on sta rate table changes 2014-11-19 19:15:50 +01:00
rate.h mac80211: remove PID rate control 2014-06-23 11:05:23 +02:00
rc80211_minstrel_debugfs.c mac80211: minstrels: fix buffer overflow in HT debugfs rc_stats 2014-10-20 16:37:01 +02:00
rc80211_minstrel_ht_debugfs.c mac80211: minstrel_ht: use group flags instead of index to display rates 2014-10-23 20:36:13 +02:00
rc80211_minstrel_ht.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-11-21 22:28:24 -05:00
rc80211_minstrel_ht.h mac80211: minstrel_ht: add basic support for VHT rates <= 3SS@80MHz 2014-10-21 13:25:26 +02:00
rc80211_minstrel.c mac80211: fix spelling errors 2014-10-31 08:29:56 +01:00
rc80211_minstrel.h mac80211: Unify rate statistic variables between Minstrel & Minstrel_HT 2014-09-11 12:08:31 +02:00
rx.c It has been a while since my last pull request, so we accumulated 2014-11-20 16:09:30 -05:00
scan.c mac80211: allow drivers to support NL80211_SCAN_FLAG_RANDOM_ADDR 2014-11-19 18:46:09 +01:00
spectmgmt.c mac80211: use secondary channel offset IE also beacons during CSA 2014-10-29 16:37:45 +01:00
sta_info.c mac80211: synchronously reserve TID per station 2014-11-19 18:45:36 +01:00
sta_info.h mac80211: synchronously reserve TID per station 2014-11-19 18:45:36 +01:00
status.c mac80211: retransmit TDLS teardown packet through AP if not ACKed 2014-11-19 18:44:29 +01:00
tdls.c mac80211: add TDLS channel-switch Rx flow 2014-11-19 18:45:26 +01:00
tkip.c
tkip.h
trace.c
trace.h mac80211: notify drivers on sta rate table changes 2014-11-19 19:15:50 +01:00
tx.c mac80211: allow drivers to support NL80211_SCAN_FLAG_RANDOM_ADDR 2014-11-19 18:46:09 +01:00
util.c mac80211: allow drivers to support NL80211_SCAN_FLAG_RANDOM_ADDR 2014-11-19 18:46:09 +01:00
vht.c mac80211: don't allow 40MHz tx rates in case of 20MHz chandef 2014-11-19 18:46:30 +01:00
wep.c mac80211: fix network header breakage during encryption 2014-10-23 20:40:01 +02:00
wep.h
wme.c mac80211: synchronously reserve TID per station 2014-11-19 18:45:36 +01:00
wme.h mac80211: add WMM admission control support 2014-10-22 10:42:09 +02:00
wpa.c mac80211: fix network header breakage during encryption 2014-10-23 20:40:01 +02:00
wpa.h