kernel-fxtec-pro1x/net/mac80211
Reinette Chatre ad41ee3a45 Merge branch 'wireless-2.6' into wireless-next-2.6
Patch "iwlwifi: work around passive scan issue" was merged into
wireless-2.6, but touched a lot of code since modified (and moved)
in wireless-next-2.6. This caused some conflicts.

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-scan.c

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
2010-04-30 15:13:00 -07:00
..
aes_ccm.c
aes_ccm.h
aes_cmac.c
aes_cmac.h
agg-rx.c mac80211: fix stopping RX BA session from timer 2010-04-19 16:41:42 -04:00
agg-tx.c Merge branch 'wireless-2.6' into wireless-next-2.6 2010-04-30 15:13:00 -07:00
cfg.c mac80211: Determine dynamic PS timeout based on ps-qos network latency 2010-04-27 16:09:22 -04:00
cfg.h
debugfs.c mac80211: Added a new debugfs file for reading channel_type 2010-02-08 16:50:57 -05:00
debugfs.h cfg80211/mac80211: use debugfs_remove_recursive 2009-10-30 16:49:18 -04:00
debugfs_key.c mac80211: reduce reliance on netdev 2009-12-21 18:38:52 -05:00
debugfs_key.h
debugfs_netdev.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge 2010-04-08 13:34:54 -04:00
debugfs_netdev.h mac80211: reduce reliance on netdev 2009-12-21 18:38:52 -05:00
debugfs_sta.c mac80211: fix typo for LDPC capability 2010-04-09 13:43:09 -04:00
debugfs_sta.h
driver-ops.h mac80211: give virtual interface to hw_scan 2010-04-27 16:09:23 -04:00
driver-trace.c mac80211: fix sparse warnings/errors 2009-08-04 16:43:25 -04:00
driver-trace.h mac80211: give virtual interface to hw_scan 2010-04-27 16:09:23 -04:00
event.c
ht.c mac80211: remove ieee80211_sta_stop_rx_ba_session 2010-04-07 14:38:03 -04:00
ibss.c mac80211: tell driver about IBSS merge 2010-04-30 14:59:15 -04:00
ieee80211_i.h mac80211: remove ieee80211_sta_stop_rx_ba_session 2010-04-07 14:38:03 -04:00
iface.c mac80211: Add support for connection monitor in hardware 2010-03-23 16:51:42 -04:00
Kconfig mac80211: enhance tracing 2010-04-08 15:24:13 -04:00
key.c ath9k: Group Key fix for VAPs 2010-04-20 11:50:51 -04:00
key.h mac80211 : fix a race with update_tkip_key 2009-12-22 13:31:14 -05:00
led.c
led.h
main.c mac80211: Determine dynamic PS timeout based on ps-qos network latency 2010-04-27 16:09:22 -04:00
Makefile mac80211: Generalize off-channel operation helpers from scan code 2009-12-28 16:55:01 -05:00
mesh.c mac80211: Moved mesh action codes to a more visible location 2010-04-08 15:24:07 -04:00
mesh.h mac80211: Moved mesh action codes to a more visible location 2010-04-08 15:24:07 -04:00
mesh_hwmp.c mac80211: Moved mesh action codes to a more visible location 2010-04-08 15:24:07 -04:00
mesh_pathtbl.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 2009-12-25 16:34:56 -08:00
mesh_plink.c mac80211: Moved mesh action codes to a more visible location 2010-04-08 15:24:07 -04:00
michael.c
michael.h
mlme.c Merge branch 'wireless-2.6' into wireless-next-2.6 2010-04-30 15:13:00 -07:00
offchannel.c mac80211: Fixed netif_tx_wake_all_queues in IBSS mode 2010-01-15 16:58:28 -05:00
pm.c mac80211: rename WLAN_STA_SUSPEND to WLAN_STA_BLOCK_BA 2010-04-07 14:38:04 -04:00
rate.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 2010-02-26 16:54:45 -05:00
rate.h mac80211: Fix HT rate control configuration 2010-03-03 15:39:21 -05:00
rc80211_minstrel.c minstrel: make the rate control ops reusable from another rc implementation 2010-03-10 17:44:23 -05:00
rc80211_minstrel.h minstrel: make the rate control ops reusable from another rc implementation 2010-03-10 17:44:23 -05:00
rc80211_minstrel_debugfs.c minstrel: make the rate control ops reusable from another rc implementation 2010-03-10 17:44:23 -05:00
rc80211_pid.h
rc80211_pid_algo.c mac80211: pid: replace open-coded msecs_to_jiffies 2010-01-19 16:25:15 -05:00
rc80211_pid_debugfs.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
rx.c mac80211: delay skb linearising in rx decryption 2010-04-09 13:43:09 -04:00
scan.c mac80211: do not wip out old supported rates 2010-04-28 16:50:28 -04:00
spectmgmt.c mac80211: reduce reliance on netdev 2009-12-21 18:38:52 -05:00
sta_info.c mac80211: Prevent running sta_cleanup timer unnecessarily 2010-04-19 16:41:42 -04:00
sta_info.h mac80211: clean up/fix aggregation code 2010-04-07 14:38:05 -04:00
status.c mac80211: Fix sta->last_tx_rate setting with no-op rate control devices 2010-04-26 14:11:40 -04:00
tkip.c mac80211: pass vif and station to update_tkip_key 2010-01-22 16:08:55 -05:00
tkip.h
tx.c mac80211: fix rts threshold check 2010-04-27 16:09:23 -04:00
util.c mac80211: enhance tracing 2010-04-08 15:24:13 -04:00
wep.c mac80211: avoid NULL ptr deref when using WEP 2010-01-22 12:39:14 -05:00
wep.h cfg80211: rework key operation 2009-07-24 15:05:09 -04:00
wme.c mac80211: fix-up build breakage in 2.6.33 2010-01-06 15:35:49 -05:00
wme.h mac80211: fix skb buffering issue 2010-01-05 16:21:40 -05:00
work.c mac80211: fix supported rates IE if AP doesn't give us it's rates 2010-04-28 16:50:29 -04:00
wpa.c mac80211: move control.hw_key assignment 2010-01-19 16:25:19 -05:00
wpa.h