1
linux/net/mac80211
David S. Miller f24001941c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fix merge between commit 3adadc08cc ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-23 23:15:17 -04:00
..
aes_ccm.c mac80211: use AES_BLOCK_SIZE 2011-07-08 11:11:24 -04:00
aes_ccm.h mac80211: use AES_BLOCK_SIZE 2011-07-08 11:11:24 -04:00
aes_cmac.c mac80211: use AES_BLOCK_SIZE 2011-07-08 11:11:24 -04:00
aes_cmac.h mac80211: fix CMAC races 2011-07-08 11:11:20 -04:00
agg-rx.c mac80211: optimize aggregation session timeout handling 2012-04-09 16:09:36 -04:00
agg-tx.c mac80211: add improved HW queue control 2012-04-11 16:23:50 -04:00
cfg.c cfg80211: Add channel information to NL80211_CMD_GET_INTERFACE 2012-04-13 14:32:49 -04:00
cfg.h
chan.c mac80211: remove channel type argument from rate_update 2012-04-10 14:54:08 -04:00
debugfs_key.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
debugfs_key.h
debugfs_netdev.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-04-12 13:49:28 -04:00
debugfs_netdev.h
debugfs_sta.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-04-12 13:49:28 -04:00
debugfs_sta.h
debugfs.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
debugfs.h simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
driver-ops.h cfg80211/mac80211: enable proper device_set_wakeup_enable handling 2012-04-11 16:23:57 -04:00
driver-trace.c
driver-trace.h cfg80211/mac80211: enable proper device_set_wakeup_enable handling 2012-04-11 16:23:57 -04:00
event.c
ht.c mac80211: set HT channel before association 2012-04-10 14:54:07 -04:00
ibss.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-23 23:15:17 -04:00
ieee80211_i.h mac80211: remove ieee80211_rx_bss_get 2012-04-13 14:32:51 -04:00
iface.c mac80211: check IEEE80211_HW_QUEUE_CONTROL in ieee80211_check_queues() 2012-04-16 14:16:58 -04:00
Kconfig mac80211: Implement mesh synchronization framework 2012-04-10 15:20:31 -04:00
key.c mac80211: clean up asm/unaligned.h inclusion 2012-02-27 14:06:32 -05:00
key.h mac80211: allow driver to disconnect after resume 2011-07-13 14:49:43 -04:00
led.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
led.h
main.c mac80211: add improved HW queue control 2012-04-11 16:23:50 -04:00
Makefile mac80211: Implement mesh synchronization framework 2012-04-10 15:20:31 -04:00
mesh_hwmp.c mac80211: fix the assignment of PREQ's MAC address for Proactive RANN 2012-04-12 15:10:31 -04:00
mesh_pathtbl.c mac80211: fix the assignment of PREQ's MAC address for Proactive RANN 2012-04-12 15:10:31 -04:00
mesh_plink.c mac80211: Check basic rates when peering 2012-04-11 16:23:47 -04:00
mesh_sync.c mac80211: Take into account TSF adjustment latency in Toffset setpoint 2012-04-16 14:19:29 -04:00
mesh.c mac80211: Check basic rates when peering 2012-04-11 16:23:47 -04:00
mesh.h mac80211: Check basic rates when peering 2012-04-11 16:23:47 -04:00
michael.c
michael.h
mlme.c mac80211: do not scan and monitor connection in parallel 2012-04-13 14:31:49 -04:00
offchannel.c mac80211: remove dead code 2012-01-04 14:31:47 -05:00
pm.c mac80211: add explicit monitor interface if needed 2012-04-11 16:23:49 -04:00
rate.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
rate.h mac80211: notify driver of rate control updates 2012-04-10 14:54:08 -04:00
rc80211_minstrel_debugfs.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
rc80211_minstrel_ht_debugfs.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
rc80211_minstrel_ht.c mac80211: remove hw.conf.channel usage where possible 2012-04-13 14:32:50 -04:00
rc80211_minstrel_ht.h
rc80211_minstrel.c mac80211: remove hw.conf.channel usage where possible 2012-04-13 14:32:50 -04:00
rc80211_minstrel.h minstrel_ht: fixed rate mode through debugfs 2011-06-01 15:12:29 -04:00
rc80211_pid_algo.c net: fix assignment of 0/1 to bool variables. 2011-12-19 22:27:29 -05:00
rc80211_pid_debugfs.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
rc80211_pid.h
rx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-23 23:15:17 -04:00
scan.c mac80211: remove ieee80211_rx_bss_get 2012-04-13 14:32:51 -04:00
spectmgmt.c mac80211: Remove unnecessary OOM logging messages 2011-09-13 15:45:02 -04:00
sta_info.c mac80211: end service period only after sending last buffered frame 2012-04-09 16:06:00 -04:00
sta_info.h mac80211: Implement mesh synchronization framework 2012-04-10 15:20:31 -04:00
status.c mac80211: fix an issue in ieee80211_tx_info count field management 2012-04-13 14:32:49 -04:00
tkip.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
tkip.h mac80211: fix TKIP races, make API easier to use 2011-07-08 11:11:19 -04:00
tx.c mac80211: remove hw.conf.channel usage where possible 2012-04-13 14:32:50 -04:00
util.c mac80211: add function retrieve average rssi 2012-04-16 14:38:49 -04:00
wep.c mac80211: linearize SKBs as needed for crypto 2012-03-13 14:54:17 -04:00
wep.h mac80211: move RX WEP weak IV counting 2012-03-13 14:54:16 -04:00
wme.c mac80211: use IEEE80211_NUM_ACS 2012-04-10 14:56:10 -04:00
wme.h mac80211: make ieee80211_downgrade_queue static 2012-04-10 14:54:06 -04:00
work.c mac80211: protect ->scanning by mutex in ieee80211_work_work() 2012-04-13 14:31:50 -04:00
wpa.c mac80211: linearize SKBs as needed for crypto 2012-03-13 14:54:17 -04:00
wpa.h mac80211: fix tx->skb NULL pointer dereference 2012-01-16 15:01:16 -05:00