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

2026-09-26 18:16:26 +00:00 · 2008-07-08 15:39:41 -07:00 · 2008-07-08 15:39:41 -07:00 · 54dceb008f
commit 54dceb008f
parent 11a100f844 b46372710a
49 changed files with 1449 additions and 678 deletions
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
--- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
--- a/drivers/net/wireless/iwlwifi/iwl-rfkill.h
+++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.h
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
--- a/drivers/net/wireless/rt2x00/rt2500pci.h
+++ b/drivers/net/wireless/rt2x00/rt2500pci.h
--- a/drivers/net/wireless/rt2x00/rt2500usb.h
+++ b/drivers/net/wireless/rt2x00/rt2500usb.h
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
--- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c
+++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
--- a/drivers/net/wireless/rtl8187.h
+++ b/drivers/net/wireless/rtl8187.h
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
--- a/drivers/net/wireless/rtl8187_rtl8225.c
+++ b/drivers/net/wireless/rtl8187_rtl8225.c
--- a/drivers/net/wireless/rtl818x.h
+++ b/drivers/net/wireless/rtl818x.h
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
--- a/net/mac80211/aes_ccm.c
+++ b/net/mac80211/aes_ccm.c
--- a/net/mac80211/aes_ccm.h
+++ b/net/mac80211/aes_ccm.h
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
--- a/net/mac80211/michael.c
+++ b/net/mac80211/michael.c
--- a/net/mac80211/michael.h
+++ b/net/mac80211/michael.h
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
--- a/net/mac80211/wme.h
+++ b/net/mac80211/wme.h
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c