黄涛 14d96d73a2 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0 ...

Merge v3.0.65
Conflicts:
	Makefile
	drivers/net/wireless/ath/ath9k/beacon.c
	drivers/net/wireless/ath/ath9k/htc_hst.c

2013-02-18 12:31:44 +08:00

..

aes_ccm.c

mac80211: Fix warnings due to -Wunused-but-set-variable

2011-04-26 15:50:31 -04:00

aes_ccm.h

…

aes_cmac.c

mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher()

2010-11-15 13:26:11 -05:00

aes_cmac.h

…

agg-rx.c

mac80211: fix possible tid_rx->reorder_timer use after free

2012-04-13 08:14:06 -07:00

agg-tx.c

mac80211: fix another race in aggregation start

2012-01-06 14:13:48 -08:00

cfg.c

mac80211: fix offchannel TX cookie matching

2011-11-11 09:35:51 -08:00

cfg.h

…

chan.c

mac80211: fix channel type recalculation with HT and non-HT interfaces

2011-03-14 14:46:58 -04:00

debugfs_key.c

mac80211: sparse RCU annotations

2011-05-16 14:10:41 -04:00

debugfs_key.h

mac80211: support separate default keys

2010-12-13 15:23:29 -05:00

debugfs_netdev.c

mac80211: fix SMPS debugfs locking

2011-04-20 16:05:59 -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 basic support for WoWLAN

2011-05-05 14:59:20 -04:00

debugfs.h

mac80211: refactor debugfs function generation code

2010-11-15 13:24:48 -05:00

driver-ops.h

mac80211: add support for HW scheduled scan

2011-05-11 15:12:27 -04:00

driver-trace.c

…

driver-trace.h

mac80211: add support for HW scheduled scan

2011-05-11 15:12:27 -04:00

event.c

…

ht.c

mac80211: sparse RCU annotations

2011-05-16 14:10:41 -04:00

ibss.c

mac80211: deinitialize ibss-internals after emptiness check

2012-12-03 12:59:14 -08:00

ieee80211_i.h

mac80211: synchronize scan off/on-channel and PS states

2013-02-14 10:47:33 -08:00

iface.c

mac80211: clean up remain-on-channel on interface stop

2012-06-17 11:23:10 -07:00

Kconfig

mac80211: remove the dependency on crypto_blkcipher

2011-04-04 16:20:00 -04:00

key.c

Revert "mac80211: Skip tailroom reservation for full HW-crypto devices"

2011-06-06 15:23:53 -04:00

key.h

mac80211: sparse RCU annotations

2011-05-16 14:10:41 -04:00

led.c

mac80211: remove stray extern

2011-01-05 16:07:12 -05:00

led.h

mac80211: selective throughput LED trigger active

2010-12-22 14:33:37 -05:00

main.c

mac80211: Fix a rwlock bad magic bug

2012-02-29 16:33:40 -08:00

Makefile

…

mesh_hwmp.c

mac80211: sparse RCU annotations

2011-05-16 14:10:41 -04:00

mesh_pathtbl.c

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2011-05-24 16:47:54 -04:00

mesh_plink.c

nl80211: Move peer link state definition to nl80211

2011-05-16 14:10:49 -04:00

mesh.c

mac80211: cancel mesh path timer

2012-08-15 12:04:11 -07:00

mesh.h

mac80211: annotate and fix RCU in mesh code

2011-05-16 14:25:29 -04:00

michael.c

…

michael.h

…

mlme.c

mac80211: disable powersave for broken APs

2011-11-11 09:37:13 -08:00

offchannel.c

mac80211: synchronize scan off/on-channel and PS states

2013-02-14 10:47:33 -08:00

pm.c

mac80211: add basic support for WoWLAN

2011-05-05 14:59:20 -04:00

rate.c

mac80211: zero initialize count field in ieee80211_tx_rate

2012-03-12 10:32:56 -07:00

rate.h

…

rc80211_minstrel_debugfs.c

…

rc80211_minstrel_ht_debugfs.c

…

rc80211_minstrel_ht.c

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

2011-05-16 19:32:19 -04:00

rc80211_minstrel_ht.h

…

rc80211_minstrel.c

mac80211: fix contention time computation in minstrel, minstrel_ht

2011-05-12 14:10:48 -04:00

rc80211_minstrel.h

…

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: check management frame header length

2012-11-17 13:14:21 -08:00

scan.c

mac80211: synchronize scan off/on-channel and PS states

2013-02-14 10:47:33 -08:00

spectmgmt.c

…

sta_info.c

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2013-01-21 17:21:19 +08:00

sta_info.h

nl80211: Move peer link state definition to nl80211

2011-05-16 14:10:49 -04:00

status.c

mac80211: fix offchannel TX cookie matching

2011-11-11 09:35:51 -08:00

tkip.c

mac80211: remove the dependency on crypto_blkcipher

2011-04-04 16:20:00 -04:00

tkip.h

mac80211: remove the dependency on crypto_blkcipher

2011-04-04 16:20:00 -04:00

tx.c

mac80211: fix AP mode EAP tx for VLAN stations

2012-05-07 08:56:48 -07:00

util.c

mac80211: fix ADDBA declined after suspend with wowlan

2012-06-10 00:32:59 +09: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: cleanup select_queue

2010-12-22 15:44:22 -05:00

wme.h

…

work.c

mac80211: synchronize scan off/on-channel and PS states

2013-02-14 10:47:33 -08:00

wpa.c

mac80211: check if key has TKIP type before updating IV

2012-10-31 09:51:37 -07:00

wpa.h

…