David S. Miller 5e30589521 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

2009-02-14 23:12:00 -08: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: further cleanups to stopping BA sessions

2009-02-13 13:45:48 -05:00

agg-tx.c

mac80211: further cleanups to stopping BA sessions

2009-02-13 13:45:48 -05:00

cfg.c

cfg80211/nl80211: scanning (and mac80211 update to use it)

2009-02-13 13:45:49 -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: move bss_conf into vif

2008-10-31 19:00:15 -04: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

mac80211: convert to %pM away from print_mac

2008-10-27 17:06:16 -07:00

ht.c

mac80211: further cleanups to stopping BA sessions

2009-02-13 13:45:48 -05:00

ieee80211_i.h

mac80211: calculate wstats_flags on the fly

2009-02-13 13:45:59 -05:00

iface.c

cfg80211/nl80211: scanning (and mac80211 update to use it)

2009-02-13 13:45:49 -05:00

Kconfig

mac80211: make Minstrel the default rate control algorithm

2008-11-26 09:47:03 -05:00

key.c

mac80211: 802.11w - Use BIP (AES-128-CMAC)

2009-01-29 16:00:03 -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

mac80211: calculate wstats_flags on the fly

2009-02-13 13:45:59 -05:00

Makefile

mac80211: restructure HT code

2009-02-13 13:45:34 -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: split managed/ibss code a little more

2009-02-13 13:46:03 -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: remove rate_control_clear

2008-10-31 19:00:37 -04: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: restrict aggregation to supported interface modes

2009-02-13 13:45:36 -05:00

scan.c

mac80211: use cfg80211s BSS infrastructure

2009-02-13 13:45:58 -05:00

spectmgmt.c

mac80211: use cfg80211s BSS infrastructure

2009-02-13 13:45:58 -05:00

sta_info.c

mac80211: fix aggregation timer lockups

2009-02-13 13:45:43 -05:00

sta_info.h

mac80211: fix aggregation timer lockups

2009-02-13 13:45:43 -05:00

tkip.c

mac80211: convert to %pM away from print_mac

2008-10-27 17:06:16 -07:00

tkip.h

…

tx.c

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-02-14 23:12:00 -08:00

util.c

mac80211: add interface list lock

2009-01-29 16:01:45 -05:00

wep.c

mac80211: fix unaligned access in ieee80211_wep_encrypt_data

2008-11-26 09:47:51 -05:00

wep.h

mac80211: minor code cleanups

2008-10-31 18:05:59 -04:00

wext.c

mac80211: calculate wstats_flags on the fly

2009-02-13 13:45:59 -05:00

wme.c

mac80211: Re-enable aggregation

2008-10-31 19:02:14 -04:00

wme.h

…

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