rpms/kernel/F-9 kernel.spec, 1.697, 1.698 linux-2.6-wireless-fixups.patch, 1.5, 1.6 linux-2.6-wireless-pending.patch, 1.53, 1.54 linux-2.6-wireless.patch, 1.42, 1.43

John W. Linville (linville) fedora-extras-commits at redhat.com
Tue Jul 1 18:43:08 UTC 2008


Author: linville

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18327

Modified Files:
	kernel.spec linux-2.6-wireless-fixups.patch 
	linux-2.6-wireless-pending.patch linux-2.6-wireless.patch 
Log Message:
Upstream wireless updates from 2008-06-27 ; Upstream wireless fixes from 2008-06-30


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.697
retrieving revision 1.698
diff -u -r1.697 -r1.698
--- kernel.spec	30 Jun 2008 19:38:16 -0000	1.697
+++ kernel.spec	1 Jul 2008 18:42:13 -0000	1.698
@@ -1861,6 +1861,12 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Jun 30 2008 John W. Linville <linville at redhat.com> 2.6.25.9-79
+- Upstream wireless fixes from 2008-06-30
+  (http://marc.info/?l=linux-wireless&m=121485709702728&w=2)
+- Upstream wireless updates from 2008-06-27
+  (http://marc.info/?l=linux-wireless&m=121458164930953&w=2)
+
 * Mon Jun 30 2008 Dave Jones <davej at redhat.com>
 - Disable rio500 driver (bz 451567)
 

linux-2.6-wireless-fixups.patch:

Index: linux-2.6-wireless-fixups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-fixups.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-wireless-fixups.patch	25 Jun 2008 17:38:37 -0000	1.5
+++ linux-2.6-wireless-fixups.patch	1 Jul 2008 18:42:13 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c
---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig	2008-07-01 14:22:15.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c	2008-07-01 14:24:27.000000000 -0400
 @@ -3659,7 +3659,7 @@ void mpi_receive_802_11 (struct airo_inf
  	ptr += hdrlen;
  	if (hdrlen == 24)
@@ -208,8 +208,8 @@
  	return 0;
  
 diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig	2008-07-01 14:22:15.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c	2008-07-01 14:24:27.000000000 -0400
 @@ -58,6 +58,10 @@
  #include "reg.h"
  #include "debug.h"
@@ -218,10 +218,10 @@
 +#define LE_READ_2(_p) (le16_to_cpu(get_unaligned((__le16 *)(_p))))
 +#define LE_READ_4(_p) (le32_to_cpu(get_unaligned((__le32 *)(_p))))
 +
- enum {
- 	ATH_LED_TX,
- 	ATH_LED_RX,
-@@ -2891,9 +2895,9 @@ static void ath5k_configure_filter(struc
+ static int ath5k_calinterval = 10; /* Calibrate PHY every 10 secs (TODO: Fixme) */
+ 
+ 
+@@ -2858,9 +2862,9 @@ static void ath5k_configure_filter(struc
  			if (!mclist)
  				break;
  			/* calculate XOR of eight 6-bit values */
@@ -234,9 +234,9 @@
  			pos &= 0x3f;
  			mfilt[pos / 32] |= (1 << (pos % 32));
 diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h
---- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h	2008-06-24 14:55:10.000000000 -0400
-@@ -965,6 +965,22 @@ static inline bool __b43_warn_on_dummy(b
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig	2008-07-01 14:22:15.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h	2008-07-01 14:24:27.000000000 -0400
+@@ -967,6 +967,22 @@ static inline bool __b43_warn_on_dummy(b
  # define B43_WARN_ON(x)	__b43_warn_on_dummy(unlikely(!!(x)))
  #endif
  
@@ -260,8 +260,8 @@
  #define INT_TO_Q52(i)	((i) << 2)
  /* Convert a Q5.2 value to an integer (precision loss!) */
 diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h
---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig	2008-07-01 14:22:15.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h	2008-07-01 14:24:27.000000000 -0400
 @@ -823,6 +823,23 @@ void b43legacydbg(struct b43legacy_wl *w
  # define b43legacydbg(wl, fmt...) do { /* nothing */ } while (0)
  #endif /* DEBUG */
@@ -287,8 +287,8 @@
  #define Q52_FMT		"%u.%u"
  #define Q52_ARG(q52)	((q52) / 4), (((q52) & 3) * 100 / 4)
 diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c
---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig	2008-07-01 14:22:15.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c	2008-07-01 14:24:27.000000000 -0400
 @@ -846,10 +846,10 @@ static void handle_irq_noise(struct b43l
  	/* Get the noise samples. */
  	B43legacy_WARN_ON(dev->noisecalc.nr_samples >= 8);
@@ -314,8 +314,8 @@
  
  			iv = (const struct b43legacy_iv *)((const uint8_t *)iv +
 diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c
---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig	2008-07-01 14:22:15.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c	2008-07-01 14:24:27.000000000 -0400
 @@ -1088,7 +1088,7 @@ static void b43legacy_phy_initg(struct b
  		 * the value 0x7FFFFFFF here. I think that is some weird
  		 * compiler optimization in the original driver.
@@ -373,8 +373,8 @@
  	return 0;
  }
 diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c
---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig	2008-07-01 14:22:15.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c	2008-07-01 14:24:27.000000000 -0400
 @@ -357,7 +357,7 @@ void b43legacy_nrssi_hw_update(struct b4
  	for (i = 0; i < 64; i++) {
  		tmp = b43legacy_nrssi_hw_read(dev, i);
@@ -430,8 +430,8 @@
  	pamp = b43legacy_get_txgain_freq_power_amp(txpower);
  	pamp <<= 5;
 diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c
---- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig	2008-07-01 14:22:15.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c	2008-07-01 14:24:27.000000000 -0400
 @@ -199,7 +199,7 @@ static void lo_measure_txctl_values(stru
  		if (lb_gain > 10) {
  			radio_pctl_reg = 0;
@@ -451,9 +451,9 @@
  		if (phy->pga_gain >= 5) {
  			phy->pga_gain -= 5;
 diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/main.c
---- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c	2008-06-24 14:55:10.000000000 -0400
-@@ -1187,10 +1187,10 @@ static void handle_irq_noise(struct b43_
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig	2008-07-01 14:22:15.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c	2008-07-01 14:24:27.000000000 -0400
+@@ -1211,10 +1211,10 @@ static void handle_irq_noise(struct b43_
  	/* Get the noise samples. */
  	B43_WARN_ON(dev->noisecalc.nr_samples >= 8);
  	i = dev->noisecalc.nr_samples;
@@ -468,7 +468,7 @@
  	dev->noisecalc.samples[i][0] = phy->nrssi_lt[noise[0]];
  	dev->noisecalc.samples[i][1] = phy->nrssi_lt[noise[1]];
  	dev->noisecalc.samples[i][2] = phy->nrssi_lt[noise[2]];
-@@ -2331,7 +2331,7 @@ static int b43_write_initvals(struct b43
+@@ -2355,7 +2355,7 @@ static int b43_write_initvals(struct b43
  				goto err_format;
  			array_size -= sizeof(iv->data.d32);
  
@@ -478,8 +478,8 @@
  
  			iv = (const struct b43_iv *)((const uint8_t *)iv +
 diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c
---- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig	2008-07-01 14:22:15.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c	2008-07-01 14:24:27.000000000 -0400
 @@ -1400,7 +1400,7 @@ static void b43_phy_initg(struct b43_wld
  		 * the value 0x7FFFFFFF here. I think that is some weird
  		 * compiler optimization in the original driver.
@@ -580,8 +580,8 @@
  			tmp_u16 = b43_phy_read(dev, 0x048A) & 0xF000;
  			tmp_u16 |= ((u32) b & 0x0000003F);
 diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c
---- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig	2008-07-01 14:22:15.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c	2008-07-01 14:24:27.000000000 -0400
 @@ -556,36 +556,40 @@ static void iwl3945_add_radiotap(struct 
  	iwl3945_rt->rt_hdr.it_pad = 0;
  
@@ -638,8 +638,8 @@
  
  	if (rate == -1)
 diff -up linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c
---- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig	2008-07-01 14:22:16.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c	2008-07-01 14:24:27.000000000 -0400
 @@ -523,7 +523,7 @@ static int lbs_process_bss(struct bss_de
  
  	if (*bytesleft >= sizeof(beaconsize)) {
@@ -649,9 +649,32 @@
  		*bytesleft -= sizeof(beaconsize);
  		*pbeaconinfo += sizeof(beaconsize);
  	}
+diff -up linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c
+--- linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig	2008-07-01 14:22:16.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c	2008-07-01 14:24:27.000000000 -0400
+@@ -430,16 +430,15 @@ static int __init init_mac80211_hwsim(vo
+ 		hwsim_radios[i] = hw;
+ 
+ 		data = hw->priv;
+-		data->dev = device_create_drvdata(hwsim_class, NULL, 0, hw,
+-						"hwsim%d", i);
++		data->dev = device_create(hwsim_class, NULL, 0, "hwsim%d", i);
+ 		if (IS_ERR(data->dev)) {
+-			printk(KERN_DEBUG
+-			       "mac80211_hwsim: device_create_drvdata "
++			printk(KERN_DEBUG "mac80211_hwsim: device_create "
+ 			       "failed (%ld)\n", PTR_ERR(data->dev));
+ 			err = -ENOMEM;
+ 			goto failed;
+ 		}
+ 		data->dev->driver = &mac80211_hwsim_driver;
++		dev_set_drvdata(data->dev, hw);
+ 
+ 		SET_IEEE80211_DEV(hw, data->dev);
+ 		addr[3] = i >> 8;
 diff -up linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c
---- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig	2008-07-01 14:22:16.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c	2008-07-01 14:24:27.000000000 -0400
 @@ -556,11 +556,11 @@ static void handle_rx_packet(struct zd_u
  	 * be padded. Unaligned access might also happen if the length_info
  	 * structure is not present.
@@ -666,9 +689,20 @@
  			if (k == 0)
  				return;
  			n = l+k;
+diff -up linux-2.6.25.noarch/include/linux/input.h.orig linux-2.6.25.noarch/include/linux/input.h
+--- linux-2.6.25.noarch/include/linux/input.h.orig	2008-07-01 14:23:01.000000000 -0400
++++ linux-2.6.25.noarch/include/linux/input.h	2008-07-01 14:23:41.000000000 -0400
+@@ -638,6 +638,7 @@ struct input_absinfo {
+ #define SW_TABLET_MODE		0x01  /* set = tablet mode */
+ #define SW_HEADPHONE_INSERT	0x02  /* set = inserted */
+ #define SW_RADIO		0x03  /* set = radio enabled */
++#define SW_RFKILL_ALL		SW_RADIO
+ #define SW_MAX			0x0f
+ #define SW_CNT			(SW_MAX+1)
+ 
 diff -up linux-2.6.25.noarch/net/mac80211/iface.c.orig linux-2.6.25.noarch/net/mac80211/iface.c
---- linux-2.6.25.noarch/net/mac80211/iface.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/iface.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/iface.c.orig	2008-07-01 14:22:17.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/iface.c	2008-07-01 14:24:27.000000000 -0400
 @@ -53,15 +53,6 @@ int ieee80211_if_add(struct net_device *
  	if (!ndev)
  		return -ENOMEM;
@@ -686,8 +720,8 @@
  	if (ret < 0)
  		goto fail;
 diff -up linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c
---- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig	2008-07-01 14:22:17.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c	2008-07-01 14:24:27.000000000 -0400
 @@ -26,7 +26,7 @@ static inline u32 u32_field_get(u8 *preq
  {
  	if (ae)
@@ -698,8 +732,8 @@
  
  /* HWMP IE processing macros */
 diff -up linux-2.6.25.noarch/net/mac80211/michael.c.orig linux-2.6.25.noarch/net/mac80211/michael.c
---- linux-2.6.25.noarch/net/mac80211/michael.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/michael.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/michael.c.orig	2008-07-01 14:22:17.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/michael.c	2008-07-01 14:24:27.000000000 -0400
 @@ -29,17 +29,16 @@ static void michael_block(struct michael
  static void michael_mic_hdr(struct michael_mic_ctx *mctx,
  			const u8 *key, const u8 *da, const u8 *sa, u8 priority)
@@ -750,8 +784,8 @@
 +	mic[7] = (mctx.r >> 24) & 0xff;
  }
 diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c
---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.c	2008-06-24 15:11:51.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig	2008-07-01 14:22:17.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.c	2008-07-01 14:24:27.000000000 -0400
 @@ -7,22 +7,23 @@
   * published by the Free Software Foundation.
   */
@@ -930,7 +964,7 @@
 +	iv32 = data[4] | (data[5] << 8) |
 +		(data[6] << 16) | (data[7] << 24);
  
- 	tk = &key->conf.key[ALG_TKIP_TEMP_ENCR_KEY];
+ 	tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
  	ctx = &key->u.tkip.tx;
 @@ -217,6 +264,7 @@ void ieee80211_tkip_encrypt_data(struct 
  	ieee80211_wep_encrypt_data(tfm, rc4key, 16, pos, payload_len);
@@ -947,7 +981,7 @@
 -	iv32 = get_unaligned_le32(pos + 4);
 +	iv32 = pos[4] | (pos[5] << 8) | (pos[6] << 16) | (pos[7] << 24);
  	pos += 8;
- #ifdef CONFIG_TKIP_DEBUG
+ #ifdef CONFIG_MAC80211_TKIP_DEBUG
  	{
 @@ -341,3 +389,5 @@ int ieee80211_tkip_decrypt_data(struct c
  
@@ -956,8 +990,8 @@
 +
 +
 diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c
---- linux-2.6.25.noarch/net/wireless/core.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig	2008-07-01 14:22:17.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c	2008-07-01 14:24:27.000000000 -0400
 @@ -167,13 +167,13 @@ int cfg80211_dev_rename(struct cfg80211_
  
  	/* Ignore nop renames */
@@ -975,8 +1009,8 @@
  	}
  
 diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c
---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/radiotap.c	2008-06-24 14:55:10.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig	2008-07-01 14:22:17.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/radiotap.c	2008-07-01 14:24:27.000000000 -0400
 @@ -59,21 +59,23 @@ int ieee80211_radiotap_iterator_init(
  		return -EINVAL;
  
@@ -1018,9 +1052,9 @@
  			} else
  				/* no more bitmaps: end */
 diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c
---- linux-2.6.25.noarch/net/wireless/wext.c.orig	2008-06-24 14:54:25.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c	2008-06-24 14:55:10.000000000 -0400
-@@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi
+--- linux-2.6.25.noarch/net/wireless/wext.c.orig	2008-07-01 14:22:17.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/wext.c	2008-07-01 14:24:27.000000000 -0400
+@@ -1299,7 +1299,7 @@ static void rtmsg_iwinfo(struct net_devi
  	struct sk_buff *skb;
  	int err;
  

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.53 -r 1.54 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-pending.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- linux-2.6-wireless-pending.patch	25 Jun 2008 19:29:30 -0000	1.53
+++ linux-2.6-wireless-pending.patch	1 Jul 2008 18:42:13 -0000	1.54
@@ -1,3 +1,1105 @@
+commit ff28bd94e307c67abb1bccda5d3a9018bd798e08
+Author: John W. Linville <linville at tuxdriver.com>
+Date:   Fri Jun 27 10:27:47 2008 -0400
+
+    wireless: remove RFKILL_STATE_HARD_BLOCKED warnings
+    
+      CC [M]  drivers/net/wireless/b43/rfkill.o
+    drivers/net/wireless/b43/rfkill.c: In function ‘b43_rfkill_soft_toggle’:
+    drivers/net/wireless/b43/rfkill.c:90: warning: enumeration value ‘RFKILL_STATE_HARD_BLOCKED’ not handled in switch
+    
+      CC [M]  drivers/net/wireless/b43legacy/rfkill.o
+    drivers/net/wireless/b43legacy/rfkill.c: In function ‘b43legacy_rfkill_soft_toggle’:
+    drivers/net/wireless/b43legacy/rfkill.c:92: warning: enumeration value ‘RFKILL_STATE_HARD_BLOCKED’ not handled in switch
+    
+      CC [M]  drivers/net/wireless/iwlwifi/iwl-rfkill.o
+    drivers/net/wireless/iwlwifi/iwl-rfkill.c: In function ‘iwl_rfkill_soft_rf_kill’:
+    drivers/net/wireless/iwlwifi/iwl-rfkill.c:56: warning: enumeration value ‘RFKILL_STATE_HARD_BLOCKED’ not handled in switch
+    
+    Also handle RFKILL_STATE_{ON,OFF} -> RFKILL_STATE_{UNBLOCKED,SOFT_BLOCKED}
+    conversion since I'm already here...
+    
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit d195a2ca46ec50e3b5c045a36d1defb6e04cc6b7
+Author: John W. Linville <linville at tuxdriver.com>
+Date:   Fri Jun 27 09:31:29 2008 -0400
+
+    ath5k: remove now unused variable declared in ath5k_tx
+    
+      CC [M]  drivers/net/wireless/ath5k/base.o
+    drivers/net/wireless/ath5k/base.c: In function ‘ath5k_tx’:
+    drivers/net/wireless/ath5k/base.c:2598: warning: unused variable ‘info’
+    
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 03f93c3d4c8aa9ed2e2b0a949ece658053527d71
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date:   Wed Jun 25 14:36:27 2008 +0300
+
+    mac80211: fix tx fragmentation
+    
+    This patch fixes TX fragmentation caused by
+    tx handlers reordering and 'tx info to cb' patches
+    
+    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 59959a6150c8af737898e83f727e824dbed7b0fa
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date:   Thu Jun 26 19:59:56 2008 +0200
+
+    mac80211: make workqueue freezable
+    
+    This patch makes the mac80211 workqueue freezable making it
+    interact a bit better with system suspend and not try to ping
+    the AP while the hardware is down.
+    
+    This doesn't really help with implementing proper suspend in
+    any way but makes some bad things trigger less.
+    
+    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit e292c737fc57d3ca718056f3308c725c8e541729
+Author: Pavel Machek <pavel at suse.cz>
+Date:   Wed Jun 25 12:25:53 2008 +0200
+
+    wireless: Small cleanups
+    
+    Small whitespace cleanups for wireless drivers
+    
+    Signed-off-by: Pavel Machek <pavel at suse.cz>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit b973e42eb25036a2672db7f7749f6989ab10479c
+Author: Randy Dunlap <randy.dunlap at oracle.com>
+Date:   Tue Jun 24 21:02:46 2008 -0700
+
+    iwlwifi: fix build for CONFIG_INPUT=n
+    
+    Fix iwlwifi so that it builds cleanly with CONFIG_INPUT=n.
+    Also free the input device on exit.
+    
+    drivers/built-in.o: In function `iwl_rfkill_unregister':
+    (.text+0xbf430): undefined reference to `input_unregister_device'
+    drivers/built-in.o: In function `iwl_rfkill_init':
+    (.text+0xbf51c): undefined reference to `input_allocate_device'
+    drivers/built-in.o: In function `iwl_rfkill_init':
+    (.text+0xbf5bf): undefined reference to `input_register_device'
+    drivers/built-in.o: In function `iwl_rfkill_init':
+    (.text+0xbf5e9): undefined reference to `input_free_device'
+    net/built-in.o: In function `rfkill_disconnect':
+    rfkill-input.c:(.text+0xe71e1): undefined reference to `input_close_device'
+    rfkill-input.c:(.text+0xe71e9): undefined reference to `input_unregister_handle'
+    net/built-in.o: In function `rfkill_connect':
+    rfkill-input.c:(.text+0xe723e): undefined reference to `input_register_handle'
+    rfkill-input.c:(.text+0xe724d): undefined reference to `input_open_device'
+    rfkill-input.c:(.text+0xe725c): undefined reference to `input_unregister_handle'
+    net/built-in.o: In function `rfkill_handler_init':
+    rfkill-input.c:(.init.text+0x36ec): undefined reference to `input_register_handler'
+    net/built-in.o: In function `rfkill_handler_exit':
+    rfkill-input.c:(.exit.text+0x112c): undefined reference to `input_unregister_handler'
+    make[1]: *** [.tmp_vmlinux1] Error 1
+    
+    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 428da76523e4a9c08bdfadc25a05b520f19b9133
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date:   Tue Jun 24 19:23:36 2008 +0200
+
+    mac80211: Add RTNL warning for workqueue
+    
+    The workqueue provided by mac80211 should not be used for
+    scheduled tasks that acquire the RTNL lock. This could be done
+    when the driver uses the function ieee80211_iterate_active_interfaces()
+    within the scheduled work. Such behavior will end in locking
+    dependencies problems when an interface is being removed.
+    
+    This patch will add a notification about the RTNL locking and
+    the mac80211 workqueue to prevent driver developers from
+    blindly using it.
+    
+    Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+    Acked-by: Johannes Berg <johannes at sipsolutions.net>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit f37d08bddc5cb8de18e55f2b0a401b3eb6269af4
+Author: Tomas Winkler <tomas.winkler at intel.com>
+Date:   Tue Jun 24 15:50:17 2008 +0300
+
+    mac80211: add phy information to giwname
+    
+    This patch add phy information to giwname.
+    
+    Quoting:
+    It's not useless, it's supposed to tell you about the protocol
+    capability of the device, like "IEEE 802.11b" or "IEEE 802.11abg"
+    
+    Jean
+    
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit b9fcc4f2987a757acb3af43aa31dc860bb957970
+Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+Date:   Tue Jun 24 13:37:59 2008 +0300
+
+    mac80211: update the authentication method
+    
+    This patch updates the authentication method upon giwencode ioctl.
+    
+    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Acked-by: Johannes Berg <johannes at sipsolutions.net>
+    Acked-by: Dan Williams <dcbw at redhat.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit fa6adfe9e625a6a843a1abed5f4e7a000c11952c
+Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+Date:   Tue Jun 24 13:37:58 2008 +0300
+
+    mac80211: don't return -EINVAL upon iwconfig wlan0 rts auto
+    
+    This patch avoids returning -EINVAL upon iwconfig wlan0 rts auto. If
+    rts->fixed is 0, then we should choose a default value instead of failing.
+    
+    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Acked-by: Johannes Berg <johannes at sipsolutions.net>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 14a7dd6f6c1e0b361a37b6df52d4dc2ea36757d2
+Author: Michael Buesch <mb at bu3sch.de>
+Date:   Tue Jun 24 12:22:05 2008 +0200
+
+    b43: Fix PIO skb clobber
+    
+    This fixes a clobber of the skb that was introduced by the
+    tx_control->cb conversion patches.
+    This bug causes a crash when the skb destructor is invoked. That happens
+    on skb_orphan or skb_kfree.
+    
+    Signed-off-by: Michael Buesch <mb at bu3sch.de>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 40af48ce501ea9ad9c485504a6fa0740801fa051
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date:   Mon Jun 23 19:56:50 2008 +0200
+
[...19484 lines suppressed...]
++				  wext_ioctl_func private)
+ {
++	struct iwreq *iwr = (struct iwreq *) ifr;
+ 	struct net_device *dev;
+ 	iw_handler	handler;
+ 
+@@ -1019,12 +1034,12 @@ static int wireless_process_ioctl(struct
+ 	 * Note that 'cmd' is already filtered in dev_ioctl() with
+ 	 * (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) */
+ 	if (cmd == SIOCGIWSTATS)
+-		return ioctl_standard_call(dev, ifr, cmd,
+-					   &iw_handler_get_iwstats);
++		return standard(dev, iwr, cmd, info,
++				&iw_handler_get_iwstats);
+ 
+ 	if (cmd == SIOCGIWPRIV && dev->wireless_handlers)
+-		return ioctl_standard_call(dev, ifr, cmd,
+-					   &iw_handler_get_private);
++		return standard(dev, iwr, cmd, info,
++				&iw_handler_get_private);
+ 
+ 	/* Basic check */
+ 	if (!netif_device_present(dev))
+@@ -1035,9 +1050,9 @@ static int wireless_process_ioctl(struct
+ 	if (handler) {
+ 		/* Standard and private are not the same */
+ 		if (cmd < SIOCIWFIRSTPRIV)
+-			return ioctl_standard_call(dev, ifr, cmd, handler);
++			return standard(dev, iwr, cmd, info, handler);
+ 		else
+-			return ioctl_private_call(dev, ifr, cmd, handler);
++			return private(dev, iwr, cmd, info, handler);
+ 	}
+ 	/* Old driver API : call driver ioctl handler */
+ 	if (dev->do_ioctl)
+@@ -1045,27 +1060,154 @@ static int wireless_process_ioctl(struct
+ 	return -EOPNOTSUPP;
+ }
+ 
+-/* entry point from dev ioctl */
+-int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,
+-		      void __user *arg)
++/* If command is `set a parameter', or `get the encoding parameters',
++ * check if the user has the right to do it.
++ */
++static int wext_permission_check(unsigned int cmd)
+ {
+-	int ret;
+-
+-	/* If command is `set a parameter', or
+-	 * `get the encoding parameters', check if
+-	 * the user has the right to do it */
+ 	if ((IW_IS_SET(cmd) || cmd == SIOCGIWENCODE || cmd == SIOCGIWENCODEEXT)
+ 	    && !capable(CAP_NET_ADMIN))
+ 		return -EPERM;
+ 
++	return 0;
++}
++
++/* entry point from dev ioctl */
++static int wext_ioctl_dispatch(struct net *net, struct ifreq *ifr,
++			       unsigned int cmd, struct iw_request_info *info,
++			       wext_ioctl_func standard,
++			       wext_ioctl_func private)
++{
++	int ret = wext_permission_check(cmd);
++
++	if (ret)
++		return ret;
++
+ 	dev_load(net, ifr->ifr_name);
+ 	rtnl_lock();
+-	ret = wireless_process_ioctl(net, ifr, cmd);
++	ret = wireless_process_ioctl(net, ifr, cmd, info, standard, private);
+ 	rtnl_unlock();
+-	if (IW_IS_GET(cmd) && copy_to_user(arg, ifr, sizeof(struct iwreq)))
++
++	return ret;
++}
++
++int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,
++		      void __user *arg)
++{
++	struct iw_request_info info = { .cmd = cmd, .flags = 0 };
++	int ret;
++
++	ret = wext_ioctl_dispatch(net, ifr, cmd, &info,
++				  ioctl_standard_call,
++				  ioctl_private_call);
++	if (ret >= 0 &&
++	    IW_IS_GET(cmd) &&
++	    copy_to_user(arg, ifr, sizeof(struct iwreq)))
++		return -EFAULT;
++
++	return ret;
++}
++
++#ifdef CONFIG_COMPAT
++static int compat_standard_call(struct net_device	*dev,
++				struct iwreq		*iwr,
++				unsigned int		cmd,
++				struct iw_request_info	*info,
++				iw_handler		handler)
++{
++	const struct iw_ioctl_description *descr;
++	struct compat_iw_point *iwp_compat;
++	struct iw_point iwp;
++	int err;
++
++	descr = standard_ioctl + (cmd - SIOCIWFIRST);
++
++	if (descr->header_type != IW_HEADER_TYPE_POINT)
++		return ioctl_standard_call(dev, iwr, cmd, info, handler);
++
++	iwp_compat = (struct compat_iw_point *) &iwr->u.data;
++	iwp.pointer = compat_ptr(iwp_compat->pointer);
++	iwp.length = iwp_compat->length;
++	iwp.flags = iwp_compat->flags;
++
++	err = ioctl_standard_iw_point(&iwp, cmd, descr, handler, dev, info);
++
++	iwp_compat->pointer = ptr_to_compat(iwp.pointer);
++	iwp_compat->length = iwp.length;
++	iwp_compat->flags = iwp.flags;
++
++	return err;
++}
++
++static int compat_private_call(struct net_device *dev, struct iwreq *iwr,
++			       unsigned int cmd, struct iw_request_info *info,
++			       iw_handler handler)
++{
++	const struct iw_priv_args *descr;
++	int ret, extra_size;
++
++	extra_size = get_priv_descr_and_size(dev, cmd, &descr);
++
++	/* Check if we have a pointer to user space data or not. */
++	if (extra_size == 0) {
++		/* No extra arguments. Trivial to handle */
++		ret = handler(dev, info, &(iwr->u), (char *) &(iwr->u));
++	} else {
++		struct compat_iw_point *iwp_compat;
++		struct iw_point iwp;
++
++		iwp_compat = (struct compat_iw_point *) &iwr->u.data;
++		iwp.pointer = compat_ptr(iwp_compat->pointer);
++		iwp.length = iwp_compat->length;
++		iwp.flags = iwp_compat->flags;
++
++		ret = ioctl_private_iw_point(&iwp, cmd, descr,
++					     handler, dev, info, extra_size);
++
++		iwp_compat->pointer = ptr_to_compat(iwp.pointer);
++		iwp_compat->length = iwp.length;
++		iwp_compat->flags = iwp.flags;
++	}
++
++	/* Call commit handler if needed and defined */
++	if (ret == -EIWCOMMIT)
++		ret = call_commit_handler(dev);
++
++	return ret;
++}
++
++int compat_wext_handle_ioctl(struct net *net, unsigned int cmd,
++			     unsigned long arg)
++{
++	void __user *argp = (void __user *)arg;
++	struct iw_request_info info;
++	struct iwreq iwr;
++	char *colon;
++	int ret;
++
++	if (copy_from_user(&iwr, argp, sizeof(struct iwreq)))
++		return -EFAULT;
++
++	iwr.ifr_name[IFNAMSIZ-1] = 0;
++	colon = strchr(iwr.ifr_name, ':');
++	if (colon)
++		*colon = 0;
++
++	info.cmd = cmd;
++	info.flags = IW_REQUEST_FLAG_COMPAT;
++
++	ret = wext_ioctl_dispatch(net, (struct ifreq *) &iwr, cmd, &info,
++				  compat_standard_call,
++				  compat_private_call);
++
++	if (ret >= 0 &&
++	    IW_IS_GET(cmd) &&
++	    copy_to_user(argp, &iwr, sizeof(struct iwreq)))
+ 		return -EFAULT;
++
+ 	return ret;
+ }
++#endif
+ 
+ /************************* EVENT PROCESSING *************************/
+ /*

linux-2.6-wireless.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.42 -r 1.43 linux-2.6-wireless.patch
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- linux-2.6-wireless.patch	27 Jun 2008 19:34:18 -0000	1.42
+++ linux-2.6-wireless.patch	1 Jul 2008 18:42:14 -0000	1.43
@@ -1,3 +1,41 @@
+commit 23976efedd5ecb420b87455787c537eb4aed1981
+Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+Date:   Sat Jun 28 02:50:13 2008 +0300
+
+    mac80211: don't accept WEP keys other than WEP40 and WEP104
+    
+    This patch makes mac80211 refuse a WEP key whose length is not WEP40 nor
+    WEP104.
+    
+    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 1bcca3c463e4930cef9986b05165bb0b3eb46f63
+Author: Pavel Roskin <proski at gnu.org>
+Date:   Fri Jun 27 16:19:58 2008 -0400
+
+    hostap: fix sparse warnings
+    
+    Rewrite AID calculation in handle_pspoll() to avoid truncating bits.
+    Make hostap_80211_header_parse() static, don't export it.  Avoid
+    shadowing variables.
+    
+    Signed-off-by: Pavel Roskin <proski at gnu.org>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 15ea0ebc5b7305cc75189cb6b7924d0db5278e0c
+Author: Pavel Roskin <proski at gnu.org>
+Date:   Fri Jun 27 16:19:52 2008 -0400
+
+    hostap: don't report useless WDS frames by default
+    
+    DEBUG_EXTRA is reported to the kernel log by default, but DEBUG_EXTRA2
+    is not.  Unrelated WDS frames pollute the log unnecessarily.
+    
+    Signed-off-by: Pavel Roskin <proski at gnu.org>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
 commit 00eb7fe77eb455f807c396f9917f0f623d4c84bb
 Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
 Date:   Thu Jun 26 12:13:46 2008 +0300
@@ -9178,8 +9216,8 @@
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
 diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.c
---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig	2008-07-01 13:34:26.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c	2008-07-01 13:34:56.000000000 -0400
 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_
  	{ 0 }
  };
@@ -9377,8 +9415,8 @@
  	err = ieee80211_register_hw(dev);
  	if (err) {
 diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.h
---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig	2008-07-01 13:34:26.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h	2008-07-01 13:34:56.000000000 -0400
 @@ -534,61 +534,6 @@ struct adm8211_eeprom {
  	u8	cis_data[0];		/* 0x80, 384 bytes */
  } __attribute__ ((packed));
@@ -9466,8 +9504,8 @@
  	{1,  11},	/* FCC */
  	{1,  11},	/* IC */
 diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c
---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig	2008-07-01 13:34:26.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c	2008-07-01 13:34:56.000000000 -0400
 @@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(s
  	dev->irq = ethdev->irq;
  	dev->base_addr = ethdev->base_addr;
@@ -9722,8 +9760,8 @@
  
  /*
 diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig	2008-07-01 13:34:26.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h	2008-07-01 13:34:56.000000000 -0400
 @@ -30,7 +30,6 @@
  #include <net/mac80211.h>
  
@@ -10073,8 +10111,8 @@
  extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result);
  
 diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig	2008-07-01 13:34:26.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c	2008-07-01 13:34:56.000000000 -0400
 @@ -58,10 +58,6 @@
  #include "reg.h"
  #include "debug.h"
@@ -11128,8 +11166,8 @@
  	memcpy(stats, &sc->ll_stats, sizeof(sc->ll_stats));
  
 diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig	2008-07-01 13:34:26.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h	2008-07-01 13:34:56.000000000 -0400
 @@ -83,7 +83,7 @@ struct ath5k_txq {
  #if CHAN_DEBUG
  #define ATH_CHAN_MAX	(26+26+26+200+200)
@@ -11175,8 +11213,8 @@
  
  #define ath5k_hw_hasbssidmask(_ah) \
 diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig	2008-07-01 13:34:26.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c	2008-07-01 13:34:56.000000000 -0400
 @@ -65,7 +65,7 @@ static unsigned int ath5k_debug;
  module_param_named(debug, ath5k_debug, uint, 0);
  
@@ -11351,8 +11389,8 @@
 -#endif /* if ATH5K_DEBUG */
 +#endif /* ifdef CONFIG_ATH5K_DEBUG */
 diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig	2008-07-01 13:34:26.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h	2008-07-01 13:34:56.000000000 -0400
 @@ -61,11 +61,6 @@
  #ifndef _ATH5K_DEBUG_H
  #define _ATH5K_DEBUG_H
@@ -11437,8 +11475,8 @@
  
  #endif /* ifndef _ATH5K_DEBUG_H */
 diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig	2008-07-01 13:34:26.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c	2008-07-01 13:34:56.000000000 -0400
 @@ -1,4 +1,4 @@
 - /*
 +/*
@@ -13033,8 +13071,8 @@
  
  /****************\
 diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig	2008-07-01 13:34:26.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h	2008-07-01 13:34:56.000000000 -0400
 @@ -173,7 +173,10 @@ struct ath5k_eeprom_info {
   * (rX: reserved fields possibily used by future versions of the ar5k chipset)
   */
@@ -13236,8 +13274,8 @@
   */
  
 diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig	2008-07-01 13:34:26.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c	2008-07-01 13:34:57.000000000 -0400
 @@ -678,8 +678,8 @@ static const struct ath5k_ini ar5212_ini
  	{ AR5K_PHY(644), 0x00806333 },
  	{ AR5K_PHY(645), 0x00106c10 },
@@ -13760,8 +13798,8 @@
  		}
  
 diff -up /dev/null linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig
---- /dev/null	2008-06-26 08:31:46.303004729 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig	2008-06-27 15:17:27.000000000 -0400
+--- /dev/null	2008-07-01 08:25:54.335004873 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig	2008-07-01 13:34:57.000000000 -0400
 @@ -0,0 +1,37 @@
 +config ATH5K
 +	tristate "Atheros 5xxx wireless cards support"
@@ -13801,8 +13839,8 @@
 +	  modprobe ath5k debug=0x00000400
 +
 diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig	2008-07-01 13:34:26.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile	2008-07-01 13:34:57.000000000 -0400
 @@ -1,2 +1,6 @@
 -ath5k-objs		= base.o hw.o regdom.o initvals.o phy.o debug.o
 -obj-$(CONFIG_ATH5K)	+= ath5k.o
@@ -13813,8 +13851,8 @@
 +ath5k-$(CONFIG_ATH5K_DEBUG)	+= debug.o
 +obj-$(CONFIG_ATH5K)		+= ath5k.o
 diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c.orig	2008-06-27 15:17:11.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c	2008-06-27 15:17:27.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c.orig	2008-07-01 13:34:26.000000000 -0400
[...3488 lines suppressed...]
 diff -up linux-2.6.25.noarch/net/mac80211/tkip.h.orig linux-2.6.25.noarch/net/mac80211/tkip.h
---- linux-2.6.25.noarch/net/mac80211/tkip.h.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.h	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.h	2008-07-01 13:34:58.000000000 -0400
 @@ -11,7 +11,7 @@
  
  #include <linux/types.h>
@@ -125568,8 +125745,8 @@
  
  #endif /* TKIP_H */
 diff -up linux-2.6.25.noarch/net/mac80211/tx.c.orig linux-2.6.25.noarch/net/mac80211/tx.c
---- linux-2.6.25.noarch/net/mac80211/tx.c.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tx.c	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tx.c.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tx.c	2008-07-01 13:34:58.000000000 -0400
 @@ -25,11 +25,12 @@
  #include <asm/unaligned.h>
  
@@ -127024,8 +127201,8 @@
  	return skb;
  }
 diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c
---- linux-2.6.25.noarch/net/mac80211/util.c.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/util.c	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/util.c.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/util.c	2008-07-01 13:34:58.000000000 -0400
 @@ -25,7 +25,8 @@
  #include <net/rtnetlink.h>
  
@@ -127344,8 +127521,8 @@
 -EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces);
 +EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic);
 diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c
---- linux-2.6.25.noarch/net/mac80211/wep.c.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.c	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.c.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.c	2008-07-01 13:34:58.000000000 -0400
 @@ -305,39 +305,39 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_
  	return NULL;
  }
@@ -127436,8 +127613,8 @@
 +	return TX_CONTINUE;
  }
 diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h
---- linux-2.6.25.noarch/net/mac80211/wep.h.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.h	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.h.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.h	2008-07-01 13:34:58.000000000 -0400
 @@ -14,7 +14,7 @@
  #include <linux/skbuff.h>
  #include <linux/types.h>
@@ -127462,9 +127639,9 @@
  
  #endif /* WEP_H */
 diff -up /dev/null linux-2.6.25.noarch/net/mac80211/wext.c
---- /dev/null	2008-06-26 08:31:46.303004729 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wext.c	2008-06-27 15:17:28.000000000 -0400
-@@ -0,0 +1,1164 @@
+--- /dev/null	2008-07-01 08:25:54.335004873 -0400
++++ linux-2.6.25.noarch/net/mac80211/wext.c	2008-07-01 13:35:13.000000000 -0400
+@@ -0,0 +1,1171 @@
 +/*
 + * Copyright 2002-2005, Instant802 Networks, Inc.
 + * Copyright 2005-2006, Devicescape Software, Inc.
@@ -127562,6 +127739,13 @@
 +			}
 +		}
 +
++		if (alg == ALG_WEP &&
++			key_len != LEN_WEP40 && key_len != LEN_WEP104) {
++			ieee80211_key_free(key);
++			err = -EINVAL;
++			goto out_unlock;
++		}
++
 +		ieee80211_key_link(key, sdata, sta);
 +
 +		if (set_tx_key || (!sta && !sdata->default_key && key))
@@ -128630,8 +128814,8 @@
 +	.get_wireless_stats = ieee80211_get_wireless_stats,
 +};
 diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c
---- linux-2.6.25.noarch/net/mac80211/wme.c.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.c	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.c.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.c	2008-07-01 13:34:58.000000000 -0400
 @@ -19,10 +19,13 @@
  #include "wme.h"
  
@@ -128841,8 +129025,8 @@
 +	}
 +}
 diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h
---- linux-2.6.25.noarch/net/mac80211/wme.h.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.h	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.h.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.h	2008-07-01 13:34:58.000000000 -0400
 @@ -24,6 +24,8 @@
  
  #define QOS_CONTROL_TAG1D_MASK 0x07
@@ -128888,8 +129072,8 @@
  {
  	return 0;
 diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c
---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.c	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.c	2008-07-01 13:34:58.000000000 -0400
 @@ -70,8 +70,8 @@ static int ieee80211_get_hdr_info(const 
  }
  
@@ -129269,8 +129453,8 @@
 +	return RX_CONTINUE;
  }
 diff -up linux-2.6.25.noarch/net/mac80211/wpa.h.orig linux-2.6.25.noarch/net/mac80211/wpa.h
---- linux-2.6.25.noarch/net/mac80211/wpa.h.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.h	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.h.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.h	2008-07-01 13:34:58.000000000 -0400
 @@ -13,19 +13,19 @@
  #include <linux/types.h>
  #include "ieee80211_i.h"
@@ -129304,8 +129488,8 @@
  
  #endif /* WPA_H */
 diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c
---- linux-2.6.25.noarch/net/wireless/core.c.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c	2008-07-01 13:34:58.000000000 -0400
 @@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy)
  {
  	struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy);
@@ -129355,8 +129539,8 @@
  	mutex_lock(&cfg80211_drv_mutex);
  
 diff -up linux-2.6.25.noarch/net/wireless/core.h.orig linux-2.6.25.noarch/net/wireless/core.h
---- linux-2.6.25.noarch/net/wireless/core.h.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.h	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.h.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.h	2008-07-01 13:34:58.000000000 -0400
 @@ -78,4 +78,7 @@ extern void cfg80211_dev_free(struct cfg
  extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv,
  			       char *newname);
@@ -129366,8 +129550,8 @@
 +
  #endif /* __NET_WIRELESS_CORE_H */
 diff -up linux-2.6.25.noarch/net/wireless/Makefile.orig linux-2.6.25.noarch/net/wireless/Makefile
---- linux-2.6.25.noarch/net/wireless/Makefile.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/Makefile	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/Makefile.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/Makefile	2008-07-01 13:34:58.000000000 -0400
 @@ -1,5 +1,5 @@
  obj-$(CONFIG_WIRELESS_EXT) += wext.o
  obj-$(CONFIG_CFG80211) += cfg80211.o
@@ -129376,8 +129560,8 @@
 +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o
  cfg80211-$(CONFIG_NL80211) += nl80211.o
 diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c
---- linux-2.6.25.noarch/net/wireless/nl80211.c.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/nl80211.c	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/nl80211.c	2008-07-01 13:34:58.000000000 -0400
 @@ -81,7 +81,12 @@ static struct nla_policy nl80211_policy[
  	[NL80211_ATTR_STA_LISTEN_INTERVAL] = { .type = NLA_U16 },
  	[NL80211_ATTR_STA_SUPPORTED_RATES] = { .type = NLA_BINARY,
@@ -130068,8 +130252,8 @@
  
  /* multicast groups */
 diff -up /dev/null linux-2.6.25.noarch/net/wireless/reg.c
---- /dev/null	2008-06-26 08:31:46.303004729 -0400
-+++ linux-2.6.25.noarch/net/wireless/reg.c	2008-06-27 15:17:28.000000000 -0400
+--- /dev/null	2008-07-01 08:25:54.335004873 -0400
++++ linux-2.6.25.noarch/net/wireless/reg.c	2008-07-01 13:34:58.000000000 -0400
 @@ -0,0 +1,180 @@
 +/*
 + * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -130252,8 +130436,8 @@
 +			handle_band(wiphy->bands[band], rd);
 +}
 diff -up /dev/null linux-2.6.25.noarch/net/wireless/util.c
---- /dev/null	2008-06-26 08:31:46.303004729 -0400
-+++ linux-2.6.25.noarch/net/wireless/util.c	2008-06-27 15:17:28.000000000 -0400
+--- /dev/null	2008-07-01 08:25:54.335004873 -0400
++++ linux-2.6.25.noarch/net/wireless/util.c	2008-07-01 13:34:58.000000000 -0400
 @@ -0,0 +1,121 @@
 +/*
 + * Wireless utility functions
@@ -130377,8 +130561,8 @@
 +			set_mandatory_flags_band(wiphy->bands[band], band);
 +}
 diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c
---- linux-2.6.25.noarch/net/wireless/wext.c.orig	2008-06-27 15:17:13.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c	2008-06-27 15:17:28.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/wext.c.orig	2008-07-01 13:34:27.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/wext.c	2008-07-01 13:34:58.000000000 -0400
 @@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi
  	struct sk_buff *skb;
  	int err;




More information about the fedora-extras-commits mailing list