kevin/linux
1
Fork 0
Code
8decf86879
linux/net/mac80211
History
David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net 
Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c
2011-09-22 03:23:13 -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 Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem 2011-09-19 15:00:16 -04:00
agg-tx.c mac80211: make ieee80211_send_bar available for drivers 2011-09-14 13:56:16 -04:00
cfg.c Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem 2011-09-19 15:00:16 -04:00
cfg.h
chan.c
debugfs_key.c mac80211: fix CMAC races 2011-07-08 11:11:20 -04:00
debugfs_key.h
debugfs_netdev.c mac80211: Stop forwarding mesh traffic when tx queues are full 2011-09-14 13:56:17 -04:00
debugfs_netdev.h
debugfs_sta.c mac80211: fix debugfs printk format warning 2011-04-19 15:38:03 -04:00
debugfs_sta.h
debugfs.c mac80211: add flag to indicate HW only Tx-agg setup support 2011-09-13 15:45:03 -04:00
debugfs.h
driver-ops.h mac80211: remove offchannel_tx API 2011-08-08 16:04:05 -04:00
driver-trace.c
driver-trace.h mac80211: sync driver before TX 2011-07-20 15:04:35 -04:00
event.c
ht.c mac80211: Remove unnecessary OOM logging messages 2011-09-13 15:45:02 -04:00
ibss.c rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER 2011-08-02 04:29:23 -07:00
ieee80211_i.h mac80211: stop tx before doing hw config and rate update 2011-09-14 13:56:18 -04:00
iface.c Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem 2011-09-19 15:00:16 -04:00
Kconfig mac80211: improve mpath debugging 2011-08-24 13:59:41 -04:00
key.c mac80211: let key iteration get keys in install order 2011-07-15 13:38:33 -04:00
key.h mac80211: allow driver to disconnect after resume 2011-07-13 14:49:43 -04:00
led.c
led.h
main.c Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
Makefile
mesh_hwmp.c mac80211: Mesh data frames must have the QoS header 2011-09-14 13:56:50 -04:00
mesh_pathtbl.c Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem 2011-09-19 15:00:16 -04:00
mesh_plink.c mac80211: Mark all mesh stations as QoS capable 2011-09-14 13:56:51 -04:00
mesh.c mac80211: Mesh data frames must have the QoS header 2011-09-14 13:56:50 -04:00
mesh.h mac80211: Improve mpath state locking 2011-09-13 15:42:32 -04:00
michael.c
michael.h
mlme.c mac80211: Update device channel in case of HW channel switch supported 2011-09-14 13:56:52 -04:00
offchannel.c
pm.c mac80211: be more careful in suspend/resume 2011-07-15 13:39:42 -04:00
rate.c
rate.h
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht_debugfs.c
rc80211_minstrel_ht.c minstrel_ht: fix Open BA session request floods 2011-09-14 13:56:23 -04:00
rc80211_minstrel_ht.h
rc80211_minstrel.c minstrel_ht: fixed rate mode through debugfs 2011-06-01 15:12:29 -04:00
rc80211_minstrel.h minstrel_ht: fixed rate mode through debugfs 2011-06-01 15:12:29 -04:00
rc80211_pid_algo.c
rc80211_pid_debugfs.c
rc80211_pid.h Fix common misspellings 2011-03-31 11:26:23 -03:00
rx.c mac80211: Mesh data frames must have the QoS header 2011-09-14 13:56:50 -04:00
scan.c mac80211: implement scan supported rates 2011-07-19 16:50:00 -04:00
spectmgmt.c mac80211: Remove unnecessary OOM logging messages 2011-09-13 15:45:02 -04:00
sta_info.c Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
sta_info.h mac80211: retry sending failed BAR frames later instead of tearing down aggr 2011-09-13 15:42:30 -04:00
status.c mac80211: fix endian issues and comments for BAR failure handling 2011-09-16 16:45:42 -04:00
tkip.c mac80211: allow driver access to TKIP RX P1K 2011-07-15 13:38:32 -04:00
tkip.h mac80211: fix TKIP races, make API easier to use 2011-07-08 11:11:19 -04:00
tx.c mac80211: Mesh data frames must have the QoS header 2011-09-14 13:56:50 -04:00
util.c mac80211: add ssid config to bss information in AP-mode 2011-09-14 13:56:26 -04:00
wep.c mac80211: remove the dependency on crypto_blkcipher 2011-04-04 16:20:00 -04:00
wep.h mac80211: remove the dependency on crypto_blkcipher 2011-04-04 16:20:00 -04:00
wme.c mac80211: Mesh data frames must have the QoS header 2011-09-14 13:56:50 -04:00
wme.h mac80211: Mesh data frames must have the QoS header 2011-09-14 13:56:50 -04:00
work.c mac80211: Remove unnecessary OOM logging messages 2011-09-13 15:45:02 -04:00
wpa.c mac80211: simplify RX PN/IV handling 2011-07-08 11:42:21 -04:00
wpa.h