rpms/kernel/devel git-iwlwifi.patch, 1.2, 1.3 git-wireless-dev.patch, 1.5, 1.6 kernel-2.6.spec, 1.3065, 1.3066 linux-2.6-warnings-inline.patch, 1.3, 1.4 git-wireless-dev-fixes.patch, 1.1, NONE linux-2.6-rt2x00-scan-fix.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 13 20:44:58 UTC 2007
Author: linville
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12508
Modified Files:
git-iwlwifi.patch git-wireless-dev.patch kernel-2.6.spec
linux-2.6-warnings-inline.patch
Removed Files:
git-wireless-dev-fixes.patch linux-2.6-rt2x00-scan-fix.patch
Log Message:
update wireless bits
git-iwlwifi.patch:
Kconfig | 1
Makefile | 1
iwlwifi/Kconfig | 52
iwlwifi/Makefile | 2
iwlwifi/base.c |13762 +++++++++++++++++++++++++++++++++++++++++++++++++++
iwlwifi/iwlwifi.h | 1297 ++++
iwlwifi/iwlwifi_hw.h | 1877 ++++++
7 files changed, 16992 insertions(+)
Index: git-iwlwifi.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git-iwlwifi.patch 23 Mar 2007 18:13:09 -0000 1.2
+++ git-iwlwifi.patch 13 Apr 2007 20:44:49 -0000 1.3
@@ -1,6 +1,10 @@
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-03-22 15:14:05.000000000 -0400
-@@ -0,0 +1,13753 @@
+http://www.intellinuxwireless.org/repos/iwlwifi.git
+
+commit 54fa65b1135566728167bbab1d2f20c739632e2d
+
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-04-11 14:46:30.000000000 -0400
+@@ -0,0 +1,13762 @@
+/******************************************************************************
+
+ Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved.
@@ -109,7 +113,7 @@
+
+#include "iwlwifi.h"
+
-+#define IWLWIFI_VERSION "0.0.11k"
++#define IWLWIFI_VERSION "0.0.12k"
+
+#define DRV_DESCRIPTION "Intel(R) Wireless Link driver for Linux"
+#define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation"
@@ -1911,7 +1915,7 @@
+
+ len +=
+ sprintf(&buf[len],
-+ "Displaying %d channels in 2.4Ghz band "
++ "Displaying %d channels in 2.4GHz band "
+ "(802.11bg):\n", count);
+
+ for (i = 0; i < count; i++) {
@@ -1942,7 +1946,7 @@
+
+ len +=
+ sprintf(&buf[len],
-+ "Displaying %d channels in 5.2Ghz band "
++ "Displaying %d channels in 5.2GHz band "
+ "(802.11a):\n", count);
+
+ for (i = 0; i < count; i++) {
@@ -2279,7 +2283,7 @@
+ /* The scan completion notification came in, so kill that timer... */
+ cancel_delayed_work(&priv->scan_check);
+
-+ IPW_DEBUG_INFO("Scan pass on %sGhz took %dms\n",
++ IPW_DEBUG_INFO("Scan pass on %sGHz took %dms\n",
+ (priv->scan_bands == 2) ? "2.4" : "5.2",
+ jiffies_to_msecs(elapsed_jiffies
+ (priv->scan_pass_start, jiffies)));
@@ -4430,7 +4434,7 @@
+ * band.
+ *
+ * For example, ipw_priv->eeprom.band_3_channels[4] from the band_3
-+ * definition below maps to physical channel 42 in the 5.2Ghz spectrum.
++ * definition below maps to physical channel 42 in the 5.2GHz spectrum.
+ * The specific geography and calibration information for that channel
+ * is contained in the eeprom map itself.
+ *
@@ -4439,7 +4443,7 @@
+ *
+ * channel_map_24/52 provides the index in the channel_info array for a
+ * given channel. We have to have two separate maps as there is channel
-+ * overlap with the 2.4Ghz and 5.2Ghz spectrum as seen in band_1 and
++ * overlap with the 2.4GHz and 5.2GHz spectrum as seen in band_1 and
+ * band_2
+ *
+ * A value of 0xff stored in the channel_map indicates that the channel
@@ -4459,7 +4463,7 @@
+ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
+};
+
-+/* 5.2 Ghz bands */
++/* 5.2 GHz bands */
+static u8 ipw_eeprom_band_2[] = {
+ 183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16
+};
@@ -4483,27 +4487,27 @@
+ const u8 ** eeprom_ch_index)
+{
+ switch (band) {
-+ case 1: /* 2.4Ghz band */
++ case 1: /* 2.4GHz band */
+ *eeprom_ch_count = ARRAY_SIZE(ipw_eeprom_band_1);
+ *eeprom_ch_info = priv->eeprom.band_1_channels;
+ *eeprom_ch_index = ipw_eeprom_band_1;
+ break;
-+ case 2: /* 5.2Ghz band */
++ case 2: /* 5.2GHz band */
+ *eeprom_ch_count = ARRAY_SIZE(ipw_eeprom_band_2);
+ *eeprom_ch_info = priv->eeprom.band_2_channels;
+ *eeprom_ch_index = ipw_eeprom_band_2;
+ break;
-+ case 3: /* 5.2Ghz band */
++ case 3: /* 5.2GHz band */
+ *eeprom_ch_count = ARRAY_SIZE(ipw_eeprom_band_3);
+ *eeprom_ch_info = priv->eeprom.band_3_channels;
+ *eeprom_ch_index = ipw_eeprom_band_3;
+ break;
-+ case 4: /* 5.2Ghz band */
++ case 4: /* 5.2GHz band */
+ *eeprom_ch_count = ARRAY_SIZE(ipw_eeprom_band_4);
+ *eeprom_ch_info = priv->eeprom.band_4_channels;
+ *eeprom_ch_index = ipw_eeprom_band_4;
+ break;
-+ case 5: /* 5.2Ghz band */
++ case 5: /* 5.2GHz band */
+ *eeprom_ch_count = ARRAY_SIZE(ipw_eeprom_band_5);
+ *eeprom_ch_info = priv->eeprom.band_5_channels;
+ *eeprom_ch_index = ipw_eeprom_band_5;
@@ -4571,7 +4575,7 @@
+ ch_info->flags = eeprom_ch_info[c].flags;
+
+ if (!(is_channel_valid(ch_info))) {
-+ IPW_DEBUG_INFO("Ch. %d [%sGhz] - No Tx\n",
++ IPW_DEBUG_INFO("Ch. %d [%sGHz] - No Tx\n",
+ ch_info->channel,
+ is_channel_a_band(ch_info) ?
+ "5.2" : "2.4");
@@ -4591,7 +4595,7 @@
+ ch_info->rx_unlock = 0;
+ }
+
-+ IPW_DEBUG_INFO("Ch. %d [%sGhz] %s%s%s%s%s%s(" BIT_FMT8
++ IPW_DEBUG_INFO("Ch. %d [%sGHz] %s%s%s%s%s%s(" BIT_FMT8
+ " %ddBm): Ad-Hoc %ssupported\n",
+ ch_info->channel,
+ is_channel_a_band(ch_info) ?
@@ -4876,7 +4880,7 @@
+ * 2 = 802.11g
+ */
+
-+ /* 5.2Ghz channels start after the 2.4Ghz channels */
++ /* 5.2GHz channels start after the 2.4GHz channels */
+ modes[A].mode = MODE_IEEE80211A;
+ modes[A].channels = &channels[ARRAY_SIZE(ipw_eeprom_band_1)];
+ modes[A].rates = &rates[4];
@@ -4905,7 +4909,7 @@
+
+ if (!is_channel_valid(ch)) {
+ IPW_WARNING
-+ ("Channel %d [%sGhz] is Tx only -- skipping.\n",
++ ("Channel %d [%sGHz] is Tx only -- skipping.\n",
+ ch->channel, is_channel_a_band(ch) ? "5.2" : "2.4");
+ continue;
+ }
@@ -4914,7 +4918,7 @@
+ if (ch->channel < IEEE80211_52GHZ_MIN_CHANNEL ||
+ ch->channel > IEEE80211_52GHZ_MAX_CHANNEL) {
+ IPW_WARNING
-+ ("Channel %d [5.2Ghz] not supported by "
++ ("Channel %d [5.2GHz] not supported by "
+ "mac80211.\n", ch->channel);
+ continue;
+ }
@@ -4924,7 +4928,7 @@
+ if (ch->channel < IEEE80211_24GHZ_MIN_CHANNEL ||
+ ch->channel > IEEE80211_24GHZ_MAX_CHANNEL) {
+ IPW_WARNING
-+ ("Channel %d [2.4Ghz] not supported by "
++ ("Channel %d [2.4GHz] not supported by "
+ "mac80211.\n", ch->channel);
+ continue;
+ }
@@ -4935,13 +4939,12 @@
+
+ geo_ch->freq = ieee80211chan2mhz((ch->channel));
+ geo_ch->chan = ch->channel;
-+ geo_ch->val = ch->channel;
+ geo_ch->power_level = ch->max_power_avg;
+ geo_ch->antenna_max = 0xff;
+
+ if (is_channel_valid(ch)) {
+ geo_ch->flag = IEEE80211_CHAN_W_SCAN;
-+ if (!(ch->flags & IPW_CHANNEL_IBSS))
++ if (ch->flags & IPW_CHANNEL_IBSS)
+ geo_ch->flag |= IEEE80211_CHAN_W_IBSS;
+
+ if (ch->flags & IPW_CHANNEL_ACTIVE)
@@ -4955,7 +4958,7 @@
+ ch->max_power_avg;
+ }
+
-+ geo_ch->val = ch->flags;
++ geo_ch->val = geo_ch->flag;
+
+ }
+
@@ -7772,7 +7775,7 @@
+
+ ipw_rt->rt_tsf = tsf;
+
-+ /* Convert to DBM */
++ /* Convert to dBm */
+ ipw_rt->rt_dbmsignal = signal;
+ ipw_rt->rt_dbmnoise = noise;
+
@@ -7899,7 +7902,7 @@
+ u16 filter = priv->prom_priv->filter;
+ int hdr_only = 0;
+ struct sk_buff *dst;
-+ struct ipw_rt_rx_hdr *ipw_rt;
++ struct ipw_rt_tx_hdr *ipw_rt;
+ int len;
+
+ if (filter & IPW_PROM_NO_TX)
@@ -7945,7 +7948,7 @@
+ (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
+ (1 << IEEE80211_RADIOTAP_ANTENNA));
+
-+ /* Convert to DBM */
++ /* Convert to dBm */
+ ipw_rt->rt_dbmsignal = ctl->power_level;
+
+ /* Convert the channel data and set the flags */
@@ -8097,7 +8100,7 @@
+
+ ipw_rt->rt_tsf = tsf;
+
-+ /* Convert to DBM */
++ /* Convert to dBm */
+ ipw_rt->rt_dbmsignal = signal;
+ ipw_rt->rt_dbmnoise = noise;
+
@@ -10980,6 +10983,16 @@
+ return -EIO;
+ }
+
++ if (ipw_is_associated(priv)) {
++ if (ipw_rxon_add_station(priv,
++ priv->active_rxon.bssid_addr,
++ 1) == IPW_INVALID_STATION) {
++ IPW_ERROR("Error adding AP address for "
++ "transmit.\n");
++ return -EIO;
++ }
++ }
++
+ return 0;
+}
+
@@ -11366,8 +11379,6 @@
+
+ priv->assoc_id = 0xFFFD;
+
-+ queue_work(priv->workqueue, &priv->associate_timeout);
-+
+ spin_unlock_irqrestore(&priv->lock, flags);
+ return 0;
+}
@@ -12192,6 +12203,7 @@
+{
+ int i;
+ struct ipw_priv *priv = (struct ipw_priv *) priv_rate;
++ struct ieee80211_hw_mode *mode;
+
+ sta->txrate = 4;
+ IPW_DEBUG_RATE("rate scale global init\n");
@@ -12207,9 +12219,11 @@
+ 0, (CMD_ASYNC | CMD_NO_LOCK));
+ }
+
-+ for (i = 0; i < local->num_curr_rates; i++) {
++ mode = local->oper_hw_mode;
++
++ for (i = 0; i < mode->num_rates; i++) {
+ if ((sta->supp_rates & BIT(i)) &&
-+ (local->curr_rates[i].flags & IEEE80211_RATE_SUPPORTED))
++ (mode->rates[i].flags & IEEE80211_RATE_SUPPORTED))
+ sta->txrate = i;
+ }
+ sta->last_txrate = ipw_convert_to_rate_index(priv, sta->txrate);
@@ -12219,8 +12233,6 @@
+
+ IPW_WARNING("XXXY is HT network %d \n", sta->ht_info.is_ht);
+#endif
-+ if (priv && (priv->iw_mode != IEEE80211_IF_TYPE_STA))
-+ queue_work(priv->workqueue, &priv->associate_timeout);
+
+}
+
@@ -12377,15 +12389,16 @@
+ *local)
+{
+ int i;
++ struct ieee80211_hw_mode *mode = local->oper_hw_mode;
+
-+ for (i = 0; i < local->num_curr_rates; i++) {
-+ struct ieee80211_rate *rate = &local->curr_rates[i];
++ for (i = 0; i < mode->num_rates; i++) {
++ struct ieee80211_rate *rate = &mode->rates[i];
+
+ if (rate->flags & IEEE80211_RATE_SUPPORTED)
+ return rate;
+ }
+
-+ return &local->curr_rates[0];
++ return &mode->rates[0];
+}
+
+static int ipw_get_adjacent_rate(struct ipw_priv *priv,
@@ -13754,13 +13767,13 @@
+
+ return 0;
+}
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile.orig 2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile 2007-03-22 15:13:46.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile.orig 2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile 2007-04-11 14:46:00.000000000 -0400
@@ -0,0 +1,2 @@
+iwlwifi-objs := base.o
+obj-$(CONFIG_IWLWIFI) += iwlwifi.o
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig 2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-03-22 15:14:05.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig 2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-04-11 14:46:30.000000000 -0400
@@ -0,0 +1,1297 @@
+/******************************************************************************
+
@@ -14426,9 +14439,9 @@
+ u64 rt_tsf; /* TSF */
+ u8 rt_flags; /* radiotap packet flags */
+ u8 rt_rate; /* rate in 500kb/s */
-+ u16 rt_channel; /* channel in mhz */
++ u16 rt_channel; /* channel in mHz */
+ u16 rt_chbitmask; /* channel bitfield */
-+ s8 rt_dbmsignal; /* signal in dbM, kluged to signed */
++ s8 rt_dbmsignal; /* signal in dBm, kluged to signed */
+ s8 rt_dbmnoise;
+ u8 rt_antenna; /* antenna number */
+ u8 payload[0]; /* payload... */
@@ -14437,9 +14450,10 @@
+struct ipw_rt_tx_hdr {
+ struct ieee80211_radiotap_header rt_hdr;
+ u8 rt_rate; /* rate in 500kb/s */
-+ u16 rt_channel; /* channel in mhz */
++ u16 rt_channel; /* channel in mHz */
+ u16 rt_chbitmask; /* channel bitfield */
-+ s8 rt_dbmsignal; /* signal in dbM, kluged to signed */
++ s8 rt_dbmsignal; /* signal in dBm, kluged to signed */
++ u8 rt_antenna; /* antenna number */
+ u8 payload[0]; /* payload... */
+} __attribute__ ((packed));
+
@@ -14910,7 +14924,7 @@
+
+ struct iw_statistics wstats;
+
-+ int freq_band; /* 2.4Ghz, 5.2Ghz, Mixed */
++ int freq_band; /* 2.4GHz, 5.2GHz, Mixed */
+ int iw_mode;
+ int perfect_rssi;
+ int worst_rssi;
@@ -14940,7 +14954,6 @@
+ struct work_struct link_up;
+ struct work_struct update_link_led;
+ struct work_struct link_down;
-+ struct work_struct associate_timeout;
+ struct work_struct auth_work;
+ struct work_struct post_associate;
+ struct work_struct report_work;
@@ -15059,8 +15072,8 @@
+#define IPW3945_RX_BUF_SIZE 3000
+
+#endif /* __iwlwifi_h__ */
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig.orig 2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig 2007-03-22 15:14:05.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig.orig 2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig 2007-04-11 14:46:00.000000000 -0400
@@ -0,0 +1,52 @@
+config IWLWIFI
+ tristate "Intel PRO/Wireless 3945ABG Network Connection adapter"
@@ -15114,8 +15127,8 @@
+ If this is your first time using this driver, you should say Y here
+ as the debug information can assist others in helping you resolve
+ any problems you may encounter.
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h.orig 2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h 2007-03-22 15:14:05.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h.orig 2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h 2007-04-11 14:46:30.000000000 -0400
@@ -0,0 +1,1877 @@
+/******************************************************************************
+
@@ -15838,7 +15851,7 @@
+ struct ipw_scan_channel channels[0];
+
+ NOTE: Only one band of channels can be scanned per pass. You
-+ can not mix 2.4Ghz channels and 5.2Ghz channels and must
++ can not mix 2.4GHz channels and 5.2GHz channels and must
+ request a scan multiple times (not concurrently)
+
+ */
@@ -16994,15 +17007,15 @@
+#define IPW_RX_BUF_SIZE 3000
+
+#endif /* __iwlwifi_hw_h__ */
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile 2007-03-22 15:13:46.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile 2007-04-11 14:46:00.000000000 -0400
@@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211) += adm8211/
obj-$(CONFIG_P54_COMMON) += p54/
obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw/
obj-$(CONFIG_RTL818X) += rtl818x/
+obj-$(CONFIG_IWLWIFI) += iwlwifi/
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig 2007-03-22 15:13:46.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig 2007-04-11 14:46:00.000000000 -0400
@@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad
source "drivers/net/wireless/mac80211/p54/Kconfig"
source "drivers/net/wireless/mac80211/zd1211rw/Kconfig"
git-wireless-dev.patch:
b/.mailmap | 1
b/CREDITS | 37
b/Documentation/feature-removal-schedule.txt | 11
b/MAINTAINERS | 60
b/drivers/Kconfig | 2
b/drivers/Makefile | 1
b/drivers/misc/Kconfig | 8
b/drivers/misc/Makefile | 1
b/drivers/misc/eeprom_93cx6.c | 344
b/drivers/net/Makefile | 2
b/drivers/net/wireless/Kconfig | 120
b/drivers/net/wireless/Makefile | 3
b/drivers/net/wireless/bcm43xx/Kconfig | 4
b/drivers/net/wireless/hostap/Kconfig | 3
b/drivers/net/wireless/mac80211/Kconfig | 6
b/drivers/net/wireless/mac80211/Makefile | 6
b/drivers/net/wireless/mac80211/README | 2
b/drivers/net/wireless/mac80211/adm8211/Kconfig | 25
b/drivers/net/wireless/mac80211/adm8211/Makefile | 1
b/drivers/net/wireless/mac80211/adm8211/adm8211.c | 2172 +++++
b/drivers/net/wireless/mac80211/adm8211/adm8211.h | 622 +
b/drivers/net/wireless/mac80211/bcm43xx/Kconfig | 100
b/drivers/net/wireless/mac80211/bcm43xx/Makefile | 18
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 875 ++
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c | 433 +
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h | 110
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c | 1297 +++
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h | 361
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c | 300
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h | 56
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c | 1110 +++
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h | 92
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 3984 ++++++++++
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h | 156
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c | 163
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h | 22
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c | 4262 +++++++++++
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h | 309
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c | 671 +
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h | 170
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c | 82
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h | 41
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c | 232
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h | 9
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c | 376 +
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h | 28
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c | 611 +
b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h | 250
b/drivers/net/wireless/mac80211/p54/Kconfig | 10
b/drivers/net/wireless/mac80211/p54/Makefile | 4
b/drivers/net/wireless/mac80211/p54/net2280.h | 452 +
b/drivers/net/wireless/mac80211/p54/prism54.h | 77
b/drivers/net/wireless/mac80211/p54/prism54common.c | 821 ++
b/drivers/net/wireless/mac80211/p54/prism54common.h | 328
b/drivers/net/wireless/mac80211/p54/prism54magic.h | 77
b/drivers/net/wireless/mac80211/p54/prism54pci.c | 700 +
b/drivers/net/wireless/mac80211/p54/prism54pci.h | 106
b/drivers/net/wireless/mac80211/p54/prism54usb.c | 946 ++
b/drivers/net/wireless/mac80211/p54/prism54usb.h | 133
b/drivers/net/wireless/mac80211/rt2x00/Kconfig | 99
b/drivers/net/wireless/mac80211/rt2x00/Makefile | 12
b/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 2562 +++++++
b/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 925 ++
b/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 2859 +++++++
b/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 1192 +++
b/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 2695 +++++++
b/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 740 ++
b/drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 1070 ++
b/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c | 354
b/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h | 71
b/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c | 282
b/drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h | 80
b/drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c | 540 +
b/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h | 39
b/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h | 82
b/drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 3333 +++++++++
b/drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 1355 +++
b/drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 2993 ++++++++
b/drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 939 ++
b/drivers/net/wireless/mac80211/rtl818x/Kconfig | 9
b/drivers/net/wireless/mac80211/rtl818x/Makefile | 2
b/drivers/net/wireless/mac80211/rtl818x/rtl8187.h | 126
b/drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c | 726 +
b/drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c | 747 ++
b/drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h | 30
b/drivers/net/wireless/mac80211/rtl818x/rtl818x.h | 180
b/drivers/net/wireless/mac80211/zd1211rw/Kconfig | 19
b/drivers/net/wireless/mac80211/zd1211rw/Makefile | 11
b/drivers/net/wireless/mac80211/zd1211rw/zd_chip.c | 1679 ++++
b/drivers/net/wireless/mac80211/zd1211rw/zd_chip.h | 910 ++
b/drivers/net/wireless/mac80211/zd1211rw/zd_def.h | 57
b/drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h | 67
b/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 700 +
b/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 250
b/drivers/net/wireless/mac80211/zd1211rw/zd_rf.c | 170
b/drivers/net/wireless/mac80211/zd1211rw/zd_rf.h | 80
b/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c | 436 +
b/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c | 491 +
b/drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c | 279
b/drivers/net/wireless/mac80211/zd1211rw/zd_usb.c | 1337 +++
b/drivers/net/wireless/mac80211/zd1211rw/zd_usb.h | 241
b/drivers/net/wireless/mac80211/zd1211rw/zd_util.c | 82
b/drivers/net/wireless/mac80211/zd1211rw/zd_util.h | 29
b/drivers/net/wireless/zd1211rw/Kconfig | 4
b/drivers/ssb/Kconfig | 93
b/drivers/ssb/Makefile | 11
b/drivers/ssb/driver_chipcommon.c | 402 +
b/drivers/ssb/driver_mipscore.c | 258
b/drivers/ssb/driver_pcicore.c | 556 +
b/drivers/ssb/main.c | 1050 ++
b/drivers/ssb/pci.c | 667 +
b/drivers/ssb/pcihost_wrapper.c | 104
b/drivers/ssb/pcmcia.c | 256
b/drivers/ssb/scan.c | 407 +
b/drivers/ssb/ssb_private.h | 151
b/drivers/usb/host/Kconfig | 13
b/drivers/usb/host/ohci-hcd.c | 21
b/drivers/usb/host/ohci-ssb.c | 254
b/include/linux/Kbuild | 2
b/include/linux/crc-itu-t.h | 27
b/include/linux/eeprom_93cx6.h | 77
b/include/linux/ieee80211.h | 403 +
b/include/linux/netdevice.h | 7
b/include/linux/nl80211.h | 301
b/include/linux/ssb/ssb.h | 403 +
b/include/linux/ssb/ssb_driver_chipcommon.h | 387 +
b/include/linux/ssb/ssb_driver_extif.h | 163
b/include/linux/ssb/ssb_driver_mips.h | 47
b/include/linux/ssb/ssb_driver_pci.h | 108
b/include/linux/ssb/ssb_regs.h | 294
b/include/net/cfg80211.h | 150
b/include/net/iw_handler.h | 13
b/include/net/mac80211.h | 1106 +++
b/include/net/wireless.h | 159
b/lib/Kconfig | 8
b/lib/Makefile | 1
b/lib/crc-itu-t.c | 64
b/net/Kconfig | 12
b/net/Makefile | 2
b/net/core/Makefile | 1
b/net/core/dev.c | 33
b/net/core/rtnetlink.c | 31
b/net/ieee80211/Kconfig | 3
b/net/mac80211/Kconfig | 81
b/net/mac80211/Makefile | 21
b/net/mac80211/aes_ccm.c | 155
b/net/mac80211/aes_ccm.h | 26
b/net/mac80211/debugfs.c | 436 +
b/net/mac80211/debugfs.h | 16
b/net/mac80211/debugfs_key.c | 253
b/net/mac80211/debugfs_key.h | 34
b/net/mac80211/debugfs_netdev.c | 440 +
b/net/mac80211/debugfs_netdev.h | 30
b/net/mac80211/debugfs_sta.c | 247
b/net/mac80211/debugfs_sta.h | 12
b/net/mac80211/hostapd_ioctl.h | 347
b/net/mac80211/ieee80211.c | 5097 ++++++++++++++
b/net/mac80211/ieee80211_cfg.c | 90
b/net/mac80211/ieee80211_cfg.h | 9
b/net/mac80211/ieee80211_common.h | 98
b/net/mac80211/ieee80211_i.h | 848 ++
b/net/mac80211/ieee80211_iface.c | 366 +
b/net/mac80211/ieee80211_ioctl.c | 3290 +++++++++
b/net/mac80211/ieee80211_key.h | 106
b/net/mac80211/ieee80211_led.c | 91
b/net/mac80211/ieee80211_led.h | 32
b/net/mac80211/ieee80211_rate.c | 140
b/net/mac80211/ieee80211_rate.h | 144
b/net/mac80211/ieee80211_scan.c | 344
b/net/mac80211/ieee80211_sta.c | 3207 ++++++++
b/net/mac80211/michael.c | 104
b/net/mac80211/michael.h | 20
b/net/mac80211/rc80211_simple.c | 432 +
b/net/mac80211/sta_info.c | 463 +
b/net/mac80211/sta_info.h | 167
b/net/mac80211/tkip.c | 341
b/net/mac80211/tkip.h | 36
b/net/mac80211/wep.c | 328
b/net/mac80211/wep.h | 40
b/net/mac80211/wme.c | 685 +
b/net/mac80211/wme.h | 38
b/net/mac80211/wpa.c | 846 ++
b/net/mac80211/wpa.h | 31
b/net/wireless/Kconfig | 46
b/net/wireless/Makefile | 17
b/net/wireless/core.c | 359
b/net/wireless/core.h | 80
b/net/wireless/nl80211.c | 974 ++
b/net/wireless/nl80211.h | 24
b/net/wireless/sysfs.c | 125
b/net/wireless/sysfs.h | 9
b/net/wireless/wext-common.c | 663 +
b/net/wireless/wext-compat.c | 789 ++
b/net/wireless/wext-export.c | 29
b/net/wireless/wext-mod.c | 20
b/net/wireless/wext-old.c | 829 ++
b/net/wireless/wext.h | 51
net/core/wireless.c | 2371 ------
198 files changed, 85470 insertions(+), 2539 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- git-wireless-dev.patch 30 Mar 2007 06:27:57 -0000 1.5
+++ git-wireless-dev.patch 13 Apr 2007 20:44:49 -0000 1.6
@@ -1,13163 +1,12971 @@
---- /dev/null 2007-03-09 11:47:32.684268720 -0500
-+++ linux-2.6.20.noarch/include/net/wireless.h 2007-03-20 11:29:04.000000000 -0400
-@@ -0,0 +1,160 @@
-+#ifndef __NET_WIRELESS_H
-+#define __NET_WIRELESS_H
+git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git
+
+commit 5363171f929bc62290a1119e492f3ae7d9636c5e
+
+diff --git a/.mailmap b/.mailmap
+index bf62dbe..5662cc7 100644
+--- a/.mailmap
++++ b/.mailmap
+@@ -57,6 +57,7 @@ Jean Tourrilhes <jt at hpl.hp.com>
+ Jeff Garzik <jgarzik at pretzel.yyz.us>
+ Jens Axboe <axboe at suse.de>
+ Jens Osterkamp <Jens.Osterkamp at de.ibm.com>
++Johannes Berg <johannes at sipsolutions.net>
+ John Stultz <johnstul at us.ibm.com>
+ Juha Yrjola <at solidboot.com>
+ Juha Yrjola <juha.yrjola at nokia.com>
+diff --git a/CREDITS b/CREDITS
+index 6bd8ab8..f95e8af 100644
+--- a/CREDITS
++++ b/CREDITS
+@@ -317,6 +317,12 @@ S: 2322 37th Ave SW
+ S: Seattle, Washington 98126-2010
+ S: USA
+
++N: Johannes Berg
++E: johannes at sipsolutions.net
++W: http://johannes.sipsolutions.net/
++P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5
++D: powerpc & 802.11 hacker
++
+ N: Stephen R. van den Berg (AKA BuGless)
+ E: berg at pool.informatik.rwth-aachen.de
+ D: General kernel, gcc, and libc hacker
+@@ -659,6 +665,11 @@ D: Minor updates to SCSI code for the Co
+ S: (ask for current address)
+ S: USA
+
++N: Robin Cornelius
++E: robincornelius at users.sourceforge.net
++D: Ralink rt2x00 WLAN driver
++S: Cornwall, U.K.
+
-+/*
-+ * 802.11 device management
-+ *
-+ * Copyright 2007 Johannes Berg <johannes at sipsolutions.net>
-+ */
+ N: Mark Corner
+ E: mcorner at umich.edu
+ W: http://www.eecs.umich.edu/~mcorner/
+@@ -673,6 +684,11 @@ D: Kernel module SMART utilities
+ S: Santa Cruz, California
+ S: USA
+
++N: Luis Correia
++E: lfcorreia at users.sf.net
++D: Ralink rt2x00 WLAN driver
++S: Belas, Portugal
+
-+#include <linux/netdevice.h>
-+#include <linux/debugfs.h>
-+#include <linux/list.h>
-+#include <net/cfg80211.h>
+ N: Alan Cox
+ W: http://www.linux.org.uk/diary/
+ D: Linux Networking (0.99.10->2.0.29)
+@@ -827,6 +843,12 @@ S: Lancs
+ S: PR4 6AX
+ S: United Kingdom
+
++N: Ivo van Doorn
++E: IvDoorn at gmail.com
++W: http://www.mendiosus.nl
++D: Ralink rt2x00 WLAN driver
++S: Haarlem, The Netherlands
+
-+/**
-+ * struct wiphy - wireless hardware description
-+ * @idx: the wiphy index assigned to this item
-+ * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
-+ */
-+struct wiphy {
-+ /* assign these fields before you register the wiphy */
+ N: John G Dorsey
+ E: john+ at cs.cmu.edu
+ D: ARM Linux ports to Assabet/Neponset, Spot
+@@ -3510,6 +3532,12 @@ S: Maastrichterweg 63
+ S: 5554 GG Valkenswaard
+ S: The Netherlands
+
++N: Mark Wallis
++E: mwallis at serialmonkey.com
++W: http://mark.serialmonkey.com
++D: Ralink rt2x00 WLAN driver
++S: Newcastle, Australia
+
-+ /* permanent MAC address */
-+ u8 perm_addr[ETH_ALEN];
+ N: Peter Shaobo Wang
+ E: pwang at mmdcorp.com
+ W: http://www.mmdcorp.com/pw/linux
+@@ -3644,6 +3672,15 @@ S: Alte Regensburger Str. 11a
+ S: 93149 Nittenau
+ S: Germany
+
++N: Gertjan van Wingerde
++E: gwingerde at home.nl
++D: Ralink rt2x00 WLAN driver
++D: Minix V2 file-system
++D: Misc fixes
++S: Geessinkweg 177
++S: 7544 TX Enschede
++S: The Netherlands
+
-+ /* If multiple wiphys are registered and you're handed e.g.
-+ * a regular netdev with assigned ieee80211_ptr, you won't
-+ * know whether it points to a wiphy your driver has registered
-+ * or not. Assign this to something global to your driver to
-+ * help determine whether you own this wiphy or not. */
-+ void *privid;
+ N: Lars Wirzenius
+ E: liw at iki.fi
+ D: Linux System Administrator's Guide, author, former maintainer
+diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
+index 0bc8b0b..0f7a323 100644
+--- a/Documentation/feature-removal-schedule.txt
++++ b/Documentation/feature-removal-schedule.txt
+@@ -305,18 +305,6 @@ Who: Richard Purdie <rpurdie at rpsys.net>
+
+ ---------------------------
+
+-What: Wireless extensions over netlink (CONFIG_NET_WIRELESS_RTNETLINK)
+-When: with the merge of wireless-dev, 2.6.22 or later
+-Why: The option/code is
+- * not enabled on most kernels
+- * not required by any userspace tools (except an experimental one,
+- and even there only for some parts, others use ioctl)
+- * pointless since wext is no longer evolving and the ioctl
+- interface needs to be kept
+-Who: Johannes Berg <johannes at sipsolutions.net>
+-
+----------------------------
+-
+ What: i8xx_tco watchdog driver
+ When: in 2.6.22
+ Why: the i8xx_tco watchdog driver has been replaced by the iTCO_wdt
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 829407f..233ba0d 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -296,6 +296,14 @@ M: corentin.labbe at geomatys.fr
+ L: lm-sensors at lm-sensors.org
+ S: Maintained
+
++ADM8211 WIRELESS DRIVER
++P: Michael Wu
++M: flamingice at sourmilk.net
++L: linux-wireless at vger.kernel.org
++W: http://aluminum.sourmilk.net/adm8211/
++T: git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
++S: Maintained
+
-+ /* fields below are read-only, assigned by cfg80211 */
+ ADT746X FAN DRIVER
+ P: Colin Leroy
+ M: colin at colino.net
+@@ -656,6 +664,7 @@ S: Supported
+ ATMEL WIRELESS DRIVER
+ P: Simon Kelley
+ M: simon at thekelleys.org.uk
++L: linux-wireless at vger.kernel.org
+ W: http://www.thekelleys.org.uk/atmel
+ W: http://atmelwlandriver.sourceforge.net/
+ S: Maintained
+@@ -706,11 +715,21 @@ L: linux-hams at vger.kernel.org
+ W: http://www.baycom.org/~tom/ham/ham.html
+ S: Maintained
+
++BCM43XX WIRELESS DRIVER (DEVICESCAPE BASED VERSION)
++P: Michael Buesch
++M: mb at bu3sch.de
++P: Stefano Brivio
++M: st3 at riseup.net
++L: linux-wireless at vger.kernel.org
++W: http://bcm43xx.berlios.de/
++S: Maintained
[...149571 lines suppressed...]
-+int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason)
++/*------------------------------------------------------------------*/
++/*
++ * Standard Wireless Handler : get spy threshold
++ */
++int iw_handler_get_thrspy(struct net_device * dev,
++ struct iw_request_info *info,
++ union iwreq_data * wrqu,
++ char * extra)
+{
-+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-+ struct ieee80211_if_sta *ifsta = &sdata->u.sta;
++ struct iw_spy_data * spydata = get_spydata(dev);
++ struct iw_thrspy * threshold = (struct iw_thrspy *) extra;
+
-+ printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n",
-+ dev->name, reason);
++ /* Make sure driver is not buggy or using the old API */
++ if(!spydata)
++ return -EOPNOTSUPP;
+
-+ if (sdata->type != IEEE80211_IF_TYPE_STA &&
-+ sdata->type != IEEE80211_IF_TYPE_IBSS)
-+ return -EINVAL;
++ /* Just do it */
++ memcpy(&(threshold->low), &(spydata->spy_thr_low),
++ 2 * sizeof(struct iw_quality));
+
-+ ieee80211_send_deauth(dev, ifsta, reason);
-+ ieee80211_set_disassoc(dev, ifsta, 1);
+ return 0;
+}
++EXPORT_SYMBOL(iw_handler_get_thrspy);
+
-+
-+int ieee80211_sta_disassociate(struct net_device *dev, u16 reason)
++/*------------------------------------------------------------------*/
++/*
++ * Prepare and send a Spy Threshold event
++ */
++static void iw_send_thrspy_event(struct net_device * dev,
++ struct iw_spy_data * spydata,
++ unsigned char * address,
++ struct iw_quality * wstats)
+{
-+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-+ struct ieee80211_if_sta *ifsta = &sdata->u.sta;
++ union iwreq_data wrqu;
++ struct iw_thrspy threshold;
+
-+ printk(KERN_DEBUG "%s: disassociate(reason=%d)\n",
-+ dev->name, reason);
++ /* Init */
++ wrqu.data.length = 1;
++ wrqu.data.flags = 0;
++ /* Copy address */
++ memcpy(threshold.addr.sa_data, address, ETH_ALEN);
++ threshold.addr.sa_family = ARPHRD_ETHER;
++ /* Copy stats */
++ memcpy(&(threshold.qual), wstats, sizeof(struct iw_quality));
++ /* Copy also thresholds */
++ memcpy(&(threshold.low), &(spydata->spy_thr_low),
++ 2 * sizeof(struct iw_quality));
+
-+ if (sdata->type != IEEE80211_IF_TYPE_STA)
-+ return -EINVAL;
++ /* Send event to user space */
++ wireless_send_event(dev, SIOCGIWTHRSPY, &wrqu, (char *) &threshold);
++}
+
-+ if (!ifsta->associated)
-+ return -1;
++/* ---------------------------------------------------------------- */
++/*
++ * Call for the driver to update the spy data.
++ * For now, the spy data is a simple array. As the size of the array is
++ * small, this is good enough. If we wanted to support larger number of
++ * spy addresses, we should use something more efficient...
++ */
++void wireless_spy_update(struct net_device * dev,
++ unsigned char * address,
++ struct iw_quality * wstats)
++{
++ struct iw_spy_data * spydata = get_spydata(dev);
++ int i;
++ int match = -1;
+
-+ ieee80211_send_disassoc(dev, ifsta, reason);
-+ ieee80211_set_disassoc(dev, ifsta, 0);
-+ return 0;
++ /* Make sure driver is not buggy or using the old API */
++ if(!spydata)
++ return;
++
++ /* Update all records that match */
++ for(i = 0; i < spydata->spy_number; i++)
++ if(!compare_ether_addr(address, spydata->spy_address[i])) {
++ memcpy(&(spydata->spy_stat[i]), wstats,
++ sizeof(struct iw_quality));
++ match = i;
++ }
++
++ /* Generate an event if we cross the spy threshold.
++ * To avoid event storms, we have a simple hysteresis : we generate
++ * event only when we go under the low threshold or above the
++ * high threshold. */
++ if(match >= 0) {
++ if(spydata->spy_thr_under[match]) {
++ if(wstats->level > spydata->spy_thr_high.level) {
++ spydata->spy_thr_under[match] = 0;
++ iw_send_thrspy_event(dev, spydata,
++ address, wstats);
++ }
++ } else {
++ if(wstats->level < spydata->spy_thr_low.level) {
++ spydata->spy_thr_under[match] = 1;
++ iw_send_thrspy_event(dev, spydata,
++ address, wstats);
++ }
++ }
++ }
+}
---- /dev/null 2007-03-09 11:47:32.684268720 -0500
-+++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h 2007-03-20 11:29:04.000000000 -0400
-@@ -0,0 +1,9 @@
++EXPORT_SYMBOL(wireless_spy_update);
+diff --git a/net/wireless/wext.h b/net/wireless/wext.h
+new file mode 100644
+index 0000000..ced6667
+--- /dev/null
++++ b/net/wireless/wext.h
+@@ -0,0 +1,51 @@
+/*
-+ * mac80211 configuration hooks for cfg80211
++ * some foo for wext compat/wext interoperability
+ */
-+#ifndef __IEEE80211_CFG_H
-+#define __IEEE80211_CFG_H
++#ifndef _WEXT_H
++#define _WEXT_H
++#include <linux/netdevice.h>
++#include <linux/if.h>
++#include <linux/wireless.h>
++#include <net/iw_handler.h>
+
-+extern struct cfg80211_ops mac80211_config_ops;
++/* wext compatibility must be compiled in...
++ * this extern is in wext-compat.c */
++struct cfg80211_ioctl_ops {
++ /* used to make sure the module isn't going away
++ * can't really happen, except if no driver has cfg80211
++ * in use, but in that case */
++ struct module *module;
+
-+#endif /* __IEEE80211_CFG_H */
---- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig 2007-03-20 11:27:30.000000000 -0400
-+++ linux-2.6.20.noarch/net/ieee80211/Kconfig 2007-03-20 11:29:04.000000000 -0400
-@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP
-
- config IEEE80211_CRYPT_TKIP
- tristate "IEEE 802.11i TKIP encryption"
-- depends on IEEE80211 && NET_RADIO
-+ depends on IEEE80211
-+ select WIRELESS_EXT
- select CRYPTO
- select CRYPTO_MICHAEL_MIC
- select CRYPTO_ECB
++ /* and finally this is used to do work */
++ int (*do_wext_ioctl)(struct ifreq *ifr, unsigned int cmd);
++};
++extern struct cfg80211_ioctl_ops cfg80211_ioctl_ops;
++
++
++struct iw_statistics *get_wireless_stats(struct net_device *dev,
++ struct iw_statistics *out);
++int wireless_process_ioctl(struct ifreq *ifr, unsigned int cmd);
++
++int cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd);
++#ifdef CFG80211_MODULE
++int call_cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd);
++#else
++#define call_cfg80211_wext_ioctl cfg80211_wext_ioctl
++#endif
++
++#if defined(CONFIG_CFG80211_WEXT_COMPAT) && defined(CFG80211_MODULE)
++int cfg80211_wext_init(void);
++void cfg80211_wext_exit(void);
++#else
++static inline int cfg80211_wext_init(void)
++{
++ return 0;
++}
++static inline void cfg80211_wext_exit(void) {}
++#endif
++
++extern const struct iw_ioctl_description wext_standard_ioctl[];
++extern const unsigned wext_standard_ioctl_num;
++extern const struct iw_ioctl_description standard_event[];
++extern const int event_type_size[];
++#endif /* _WEXT_H */
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3065
retrieving revision 1.3066
diff -u -r1.3065 -r1.3066
--- kernel-2.6.spec 13 Apr 2007 20:40:51 -0000 1.3065
+++ kernel-2.6.spec 13 Apr 2007 20:44:51 -0000 1.3066
@@ -378,24 +378,22 @@
Patch10: linux-2.6-utrace.patch
Patch11: nouveau-drm.patch
Patch12: git-wireless-dev.patch
-Patch13: git-wireless-dev-fixes.patch
-Patch14: git-iwlwifi.patch
-Patch15: git-iwlwifi-fixes.patch
-Patch16: linux-2.6-rt2x00-scan-fix.patch
-Patch17: linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch
+Patch13: git-iwlwifi.patch
+Patch14: git-iwlwifi-fixes.patch
+Patch15: linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch
# FIXME: The wireless stuff really belongs in its own section given there's so much of it.
-Patch18: linux-2.6-fix-pmops-1.patch
-Patch19: linux-2.6-fix-pmops-2.patch
-Patch20: linux-2.6-fix-pmops-3.patch
-Patch21: linux-2.6-fix-pmops-4.patch
+Patch16: linux-2.6-fix-pmops-1.patch
+Patch17: linux-2.6-fix-pmops-2.patch
+Patch18: linux-2.6-fix-pmops-3.patch
+Patch19: linux-2.6-fix-pmops-4.patch
# enable sysrq-c on all kernels, not only kexec
# FIXME: upstream soon? When? It's been here for ages.
-Patch22: linux-2.6-sysrq-c.patch
+Patch20: linux-2.6-sysrq-c.patch
# DRM bits for 965
-Patch23: linux-2.6-i965gm-support.patch
+Patch21: linux-2.6-i965gm-support.patch
# Patches 100 through 500 are meant for architecture patches
@@ -978,27 +976,23 @@
# Add the new wireless stack and drivers from wireless-dev
%patch12 -p1
-# ...plus some fixes not yet in the wireless-dev tree
-%patch13 -p1
# ...and the iwlwifi driver from Intel
-%patch14 -p1
+%patch13 -p1
# ...plus some fixes not yet in Intel's tree
+%patch14 -p1
+# fix oops on ppc for bcm43xx-mac80211 w/ phy rev 1
%patch15 -p1
-# fix up scanning in rt2x00
+# Power management fixes
%patch16 -p1
-# fix oops on ppc for bcm43xx-mac80211 w/ phy rev 1
%patch17 -p1
-# Power management fixes
%patch18 -p1
%patch19 -p1
-%patch20 -p1
-%patch21 -p1
# sysrq works always
-%patch22 -p1
+%patch20 -p1
# DRM support for 965GM
-%patch23 -p1
+%patch21 -p1
# Architecture patches
@@ -2260,6 +2254,12 @@
# - tux.
%changelog
+* Fri Apr 13 2007 John W. Linville <linville at redhat.com>
+- Update git-wireless-dev.patch
+- Remove linux-2.6-rt2x00-scan-fix.patch (obsoleted by update above)
+- Remove git-wireless-dev-fixes.patch (obsoleted by update above)
+- Update git-iwlwifi.patch
+
* Fri Apr 13 2007 Dave Jones <davej at redhat.com>
- Make NMI timeout a config option.
@@ -2288,7 +2288,7 @@
* Tue Apr 11 2007 John W. Linville <linville at redhat.com>
- Add fix for bcm43xx-mac80211 oops on ppc w/ phy rev 1
-- Set IPW_WARNING to KERN_WARN to make iwlwifi less chatty
+- Set IPW_WARNING to KERN_WARNING to make iwlwifi less chatty
* Tue Apr 10 2007 John W. Linville <linville at redhat.com>
- Add fix for using WPA with mac80211 drivers
linux-2.6-warnings-inline.patch:
b/arch/i386/oprofile/op_model_p4.c | 2 -
b/arch/powerpc/kernel/prom_init.c | 4 +-
b/drivers/acpi/tables/tbfadt.c | 4 +-
b/drivers/isdn/hardware/eicon/divasmain.c | 12 +++----
b/drivers/isdn/hardware/eicon/platform.h | 4 +-
b/drivers/media/common/ir-functions.c | 2 -
b/drivers/media/video/cx88/cx88-core.c | 12 +++----
b/drivers/media/video/cx88/cx88.h | 4 +-
b/drivers/net/sky2.c | 2 -
b/drivers/net/wireless/ipw2200.c | 2 -
b/drivers/scsi/tmscsim.c | 16 +++++-----
b/drivers/usb/serial/safe_serial.c | 2 -
b/drivers/video/intelfb/intelfbdrv.c | 2 -
b/fs/ocfs2/namei.c | 2 -
b/include/asm-powerpc/spinlock.h | 10 +++---
b/include/linux/cpuset.h | 4 +-
b/kernel/mutex.c | 2 -
b/sound/drivers/opl4/opl4_lib.c | 2 -
b/sound/pci/au88x0/au88x0.h | 4 +-
b/sound/pci/au88x0/au88x0_core.c | 4 +-
linux-2.6.20.noarch/arch/ia64/kernel/mca.c | 2 -
linux-2.6.20.noarch/arch/ia64/sn/pci/pcibr/pcibr_ate.c | 2 -
linux-2.6.20.noarch/arch/ia64/sn/pci/tioce_provider.c | 4 +-
linux-2.6.20.noarch/arch/s390/kernel/traps.c | 4 +-
linux-2.6.20.noarch/drivers/char/mmtimer.c | 16 +++++-----
linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c | 10 +++---
linux-2.6.20.noarch/drivers/s390/net/ctcmain.c | 2 -
linux-2.6.20.noarch/drivers/serial/ioc3_serial.c | 4 +-
linux-2.6.20.noarch/drivers/serial/ioc4_serial.c | 4 +-
linux-2.6.20.noarch/include/asm-powerpc/spinlock.h | 8 ++---
linux-2.6.20.noarch/net/mac80211/ieee80211.c | 6 +--
31 files changed, 79 insertions(+), 79 deletions(-)
Index: linux-2.6-warnings-inline.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-warnings-inline.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-warnings-inline.patch 4 Apr 2007 23:45:39 -0000 1.3
+++ linux-2.6-warnings-inline.patch 13 Apr 2007 20:44:51 -0000 1.4
@@ -549,11 +549,11 @@
/* Device in tx->dev has a reference added; use dev_put(tx->dev) when
* finished with it. */
--static void inline ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
+-static int inline ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
+static inline int ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
- struct sk_buff *skb,
- struct net_device *mdev,
- struct ieee80211_tx_control *control)
+ struct sk_buff *skb,
+ struct net_device *mdev,
+ struct ieee80211_tx_control *control)
--- linux-2.6.20.noarch/arch/ia64/kernel/mca.c~ 2007-04-04 19:33:39.000000000 -0400
+++ linux-2.6.20.noarch/arch/ia64/kernel/mca.c 2007-04-04 19:33:43.000000000 -0400
@@ -303,7 +303,7 @@ static void ia64_mlogbuf_dump_from_init(
--- git-wireless-dev-fixes.patch DELETED ---
--- linux-2.6-rt2x00-scan-fix.patch DELETED ---
More information about the fedora-cvs-commits
mailing list