David S. Miller 2d6a5e9500 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/igb/igb_main.c drivers/net/qlge/qlge_main.c drivers/net/wireless/ath9k/ath9k.h drivers/net/wireless/ath9k/core.h drivers/net/wireless/ath9k/hw.c		2009-03-17 15:01:30 -07:00
..
aes_ccm.c
aes_ccm.h
aes_cmac.c	mac80211: 802.11w - Add BIP (AES-128-CMAC)	2009-01-29 16:00:02 -05:00
aes_cmac.h	mac80211: 802.11w - Add BIP (AES-128-CMAC)	2009-01-29 16:00:02 -05:00
agg-rx.c	mac80211: split IBSS/managed code	2009-02-27 14:51:42 -05:00
agg-tx.c	mac80211: split IBSS/managed code	2009-02-27 14:51:42 -05:00
cfg.c	mac80211: Notify the driver only when the beacon interval changes	2009-03-05 14:39:32 -05:00
cfg.h
debugfs_key.c	mac80211: 802.11w - Use BIP (AES-128-CMAC)	2009-01-29 16:00:03 -05:00
debugfs_key.h	mac80211: 802.11w - Use BIP (AES-128-CMAC)	2009-01-29 16:00:03 -05:00
debugfs_netdev.c	mac80211: split IBSS/managed code	2009-02-27 14:51:42 -05:00
debugfs_netdev.h
debugfs_sta.c	mac80211: 802.11w - STA flag for MFP	2009-01-29 16:00:00 -05:00
debugfs_sta.h
debugfs.c	mac80211: Generic TSF debugging	2009-01-29 16:01:46 -05:00
debugfs.h
event.c
ht.c	mac80211: Extend the rate control API with an update callback	2009-02-27 14:51:45 -05:00
ibss.c	mac80211: Update IBSS beacon timestamp properly	2009-03-05 14:39:40 -05:00
ieee80211_i.h	mac80211: Introduce a generic commit() to apply changes	2009-02-27 14:52:54 -05:00
iface.c	mac80211: split IBSS/managed code	2009-02-27 14:51:42 -05:00
Kconfig	mac80211: make Minstrel the default rate control algorithm	2008-11-26 09:47:03 -05:00
key.c	mac80211: split IBSS/managed code	2009-02-27 14:51:42 -05:00
key.h	mac80211: 802.11w - Use BIP (AES-128-CMAC)	2009-01-29 16:00:03 -05:00
led.c
led.h
main.c	cfg80211: clean up signal type	2009-02-27 14:52:42 -05:00
Makefile	mac80211: split IBSS/managed code	2009-02-27 14:51:42 -05:00
mesh_hwmp.c	mac80211: fix RX aggregation timeouts	2009-02-13 13:45:32 -05:00
mesh_pathtbl.c
mesh_plink.c	wireless: restrict to 32 legacy rates	2009-01-29 16:01:09 -05:00
mesh.c	mac80211: use cfg80211s BSS infrastructure	2009-02-13 13:45:58 -05:00
mesh.h	mac80211: use cfg80211s BSS infrastructure	2009-02-13 13:45:58 -05:00
michael.c
michael.h
mlme.c	mac80211: Always send a null data frame if TIM bit is set.	2009-03-05 14:39:38 -05:00
pm.c	mac80211: flush workqueue a second time in suspend()	2009-01-29 16:01:42 -05:00
rate.c	mac80211/drivers: rewrite the rate control API	2008-10-31 19:00:23 -04:00
rate.h	mac80211: Extend the rate control API with an update callback	2009-02-27 14:51:45 -05:00
rc80211_minstrel_debugfs.c
rc80211_minstrel.c	minstrel: fix warning if lowest supported rate index is not 0	2009-01-12 14:24:55 -05:00
rc80211_minstrel.h	minstrel: improve performance for non-MRR drivers	2008-10-31 19:00:36 -04:00
rc80211_pid_algo.c	mac80211: Fix pid rate-setting algorithm to allow rate changes	2008-11-26 09:47:20 -05:00
rc80211_pid_debugfs.c	mac80211/drivers: rewrite the rate control API	2008-10-31 19:00:23 -04:00
rc80211_pid.h	mac80211/drivers: rewrite the rate control API	2008-10-31 19:00:23 -04:00
rx.c	mac80211: split IBSS/managed code	2009-02-27 14:51:42 -05:00
scan.c	mac80211: Add software scan notifiers	2009-02-27 14:52:51 -05:00
spectmgmt.c	mac80211: split IBSS/managed code	2009-02-27 14:51:42 -05:00
sta_info.c	mac80211: fix aggregation for hardware with ampdu queues	2009-02-27 14:51:42 -05:00
sta_info.h	mac80211: add missing kernel-doc	2009-02-27 14:52:41 -05:00
tkip.c
tkip.h
tx.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-03-17 15:01:30 -07:00
util.c	nl80211: Optional IEs into scan request	2009-02-27 14:52:38 -05:00
wep.c	mac80211: fix unaligned access in ieee80211_wep_encrypt_data	2008-11-26 09:47:51 -05:00
wep.h
wext.c	mac80211: Fix quality reporting for wireless stats	2009-03-05 14:39:35 -05:00
wme.c	mac80211: fix aggregation for hardware with ampdu queues	2009-02-27 14:51:42 -05:00
wme.h	mac80211: fix aggregation for hardware with ampdu queues	2009-02-27 14:51:42 -05:00
wpa.c	mac80211: 802.11w - Optional software CCMP for management frames	2009-01-29 16:00:08 -05:00
wpa.h	mac80211: 802.11w - Add BIP (AES-128-CMAC)	2009-01-29 16:00:02 -05:00