David S. Miller 495a1b4eff Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 ...

Conflicts:
	net/mac80211/pm.c

2009-04-25 16:36:46 -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: Tear down aggregation sessions for suspend/resume

2009-03-27 20:12:55 -04:00

agg-tx.c

mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi

2009-03-27 20:13:23 -04:00

cfg.c

nl80211: Add set/get for frag/rts threshold and retry limits

2009-04-22 16:57:17 -04: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

nl80211: Add set/get for frag/rts threshold and retry limits

2009-04-22 16:57:17 -04:00

debugfs.h

…

event.c

nl80211: Add Michael MIC failure event

2009-04-22 16:54:28 -04:00

ht.c

cfg80211: clean up includes

2009-04-22 16:57:17 -04:00

ibss.c

mac80211: fix IBSS code to not sleep while atomic

2009-04-22 16:57:19 -04:00

ieee80211_i.h

mac80211: validate TIM IE length (redux)

2009-04-22 16:57:18 -04:00

iface.c

mac80211: convert to cfg80211 IBSS API

2009-04-22 16:57:17 -04:00

Kconfig

mac80211: enable PS by default

2009-04-22 16:57:16 -04: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

nl80211: Add set/get for frag/rts threshold and retry limits

2009-04-22 16:57:17 -04: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

nl80211: Add event for authentication/association timeout

2009-04-22 16:57:21 -04:00

pm.c

mac80211: add hardware restart function

2009-04-22 16:57:14 -04:00

rate.c

mac80211: rate control status only for controlled packets

2009-03-27 20:13:15 -04:00

rate.h

mac80211: rate control status only for controlled packets

2009-03-27 20:13:15 -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

…

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

…

rc80211_pid.h

…

rx.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2009-04-25 16:36:46 -07:00

scan.c

mac80211: convert to cfg80211 IBSS API

2009-04-22 16:57:17 -04:00

spectmgmt.c

cfg80211: clean up includes

2009-04-22 16:57:17 -04:00

sta_info.c

mac80211: convert to cfg80211 IBSS API

2009-04-22 16:57:17 -04:00

sta_info.h

mac80211: convert to cfg80211 IBSS API

2009-04-22 16:57:17 -04:00

tkip.c

…

tkip.h

…

tx.c

wireless: remove some (bogus?) 'may be used uninitialized' warnings

2009-04-24 15:41:41 -04:00

util.c

mac80211: validate TIM IE length (redux)

2009-04-22 16:57:18 -04:00

wep.c

mac80211: rewrite fragmentation

2009-03-27 20:13:21 -04:00

wep.h

…

wext.c

mac80211: remove IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT

2009-04-22 16:57:20 -04:00

wme.c

mac80211: Fix WMM ACM parsing and AC downgrade operation

2009-03-16 18:09:27 -04:00

wme.h

mac80211: fix aggregation for hardware with ampdu queues

2009-02-27 14:51:42 -05:00

wpa.c

nl80211: Add Michael MIC failure event

2009-04-22 16:54:28 -04:00

wpa.h

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

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