rpms/kernel/F-9 config-generic, 1.107, 1.108 kernel.spec, 1.711, 1.712 linux-2.6-wireless-fixups.patch, 1.9, 1.10 linux-2.6-wireless-pending.patch, 1.58, 1.59

John W. Linville (linville) fedora-extras-commits at redhat.com
Wed Jul 16 16:31:17 UTC 2008


Author: linville

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

Modified Files:
	config-generic kernel.spec linux-2.6-wireless-fixups.patch 
	linux-2.6-wireless-pending.patch 
Log Message:
Upstream wireless updates from 2008-07-14


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- config-generic	10 Jul 2008 18:26:02 -0000	1.107
+++ config-generic	16 Jul 2008 16:30:23 -0000	1.108
@@ -1266,6 +1266,8 @@
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
 CONFIG_CFG80211=m
 CONFIG_NL80211=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
 
 CONFIG_ADM8211=m
 CONFIG_ATH5K=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.711
retrieving revision 1.712
diff -u -r1.711 -r1.712
--- kernel.spec	13 Jul 2008 22:13:04 -0000	1.711
+++ kernel.spec	16 Jul 2008 16:30:23 -0000	1.712
@@ -1877,6 +1877,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Tue Jul 15 2008 John W. Linville <linville at redhat.com>
+- Upstream wireless updates from 2008-07-14
+  (http://marc.info/?l=linux-wireless&m=121606436000705&w=2)
+
 * Sun Jul 13 2008 Kyle McMartin <kmcmartin at redhat.com> 2.6.25.11-92
 - Linux 2.6.25.11
 

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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-wireless-fixups.patch	10 Jul 2008 18:26:02 -0000	1.9
+++ linux-2.6-wireless-fixups.patch	16 Jul 2008 16:30:23 -0000	1.10
@@ -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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c	2008-07-10 13:57:45.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig	2008-07-15 16:17:34.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c	2008-07-15 16:20:32.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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c	2008-07-10 13:57:45.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig	2008-07-15 16:17:50.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c	2008-07-15 16:20:32.000000000 -0400
 @@ -58,6 +58,10 @@
  #include "reg.h"
  #include "debug.h"
@@ -221,7 +221,7 @@
  static int ath5k_calinterval = 10; /* Calibrate PHY every 10 secs (TODO: Fixme) */
  
  
-@@ -2858,9 +2862,9 @@ static void ath5k_configure_filter(struc
+@@ -2869,9 +2873,9 @@ static void ath5k_configure_filter(struc
  			if (!mclist)
  				break;
  			/* calculate XOR of eight 6-bit values */
@@ -234,8 +234,8 @@
  			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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h	2008-07-10 13:57:45.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig	2008-07-15 16:17:34.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h	2008-07-15 16:20:32.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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h	2008-07-10 13:57:45.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig	2008-07-15 16:17:34.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h	2008-07-15 16:20:32.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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c	2008-07-10 13:57:45.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig	2008-07-15 16:17:50.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c	2008-07-15 16:20:32.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);
@@ -304,7 +304,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]];
-@@ -1720,7 +1720,7 @@ static int b43legacy_write_initvals(stru
+@@ -1728,7 +1728,7 @@ static int b43legacy_write_initvals(stru
  				goto err_format;
  			array_size -= sizeof(iv->data.d32);
  
@@ -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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c	2008-07-10 13:57:45.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig	2008-07-15 16:17:34.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c	2008-07-15 16:20:32.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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c	2008-07-10 13:57:45.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig	2008-07-15 16:17:34.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c	2008-07-15 16:20:32.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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c	2008-07-10 13:57:45.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig	2008-07-15 16:17:34.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c	2008-07-15 16:20:32.000000000 -0400
 @@ -199,7 +199,7 @@ static void lo_measure_txctl_values(stru
  		if (lb_gain > 10) {
  			radio_pctl_reg = 0;
@@ -451,8 +451,8 @@
  		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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c	2008-07-10 13:57:45.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig	2008-07-15 16:17:50.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c	2008-07-15 16:20:32.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);
@@ -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]];
-@@ -2355,7 +2355,7 @@ static int b43_write_initvals(struct b43
+@@ -2365,7 +2365,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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c	2008-07-10 13:57:45.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig	2008-07-15 16:17:35.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c	2008-07-15 16:20:32.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,9 +580,9 @@
  			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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c	2008-07-10 13:57:45.000000000 -0400
-@@ -556,36 +556,40 @@ static void iwl3945_add_radiotap(struct 
+--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig	2008-07-15 16:17:50.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c	2008-07-15 16:20:32.000000000 -0400
+@@ -573,36 +573,40 @@ static void iwl3945_add_radiotap(struct 
  	iwl3945_rt->rt_hdr.it_pad = 0;
  
  	/* total header + data */
@@ -637,9 +637,70 @@
  			      &iwl3945_rt->rt_chbitmask);
  
  	if (rate == -1)
+diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c
+--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c.orig	2008-07-15 16:30:45.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c	2008-07-15 16:35:43.000000000 -0400
+@@ -830,22 +830,23 @@ static void iwl_add_radiotap(struct iwl_
+ 	iwl4965_rt->rt_hdr.it_pad = 0;
+ 
+ 	/* total header + data */
+-	put_unaligned_le16(sizeof(*iwl4965_rt), &iwl4965_rt->rt_hdr.it_len);
++	put_unaligned(cpu_to_le16(sizeof(*iwl4965_rt)),
++		      &iwl4965_rt->rt_hdr.it_len);
+ 
+ 	/* Indicate all the fields we add to the radiotap header */
+-	put_unaligned_le32((1 << IEEE80211_RADIOTAP_TSFT) |
+-			   (1 << IEEE80211_RADIOTAP_FLAGS) |
+-			   (1 << IEEE80211_RADIOTAP_RATE) |
+-			   (1 << IEEE80211_RADIOTAP_CHANNEL) |
+-			   (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
+-			   (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE) |
+-			   (1 << IEEE80211_RADIOTAP_ANTENNA),
+-			   &(iwl4965_rt->rt_hdr.it_present));
++	put_unaligned(cpu_to_le32((1 << IEEE80211_RADIOTAP_TSFT) |
++				  (1 << IEEE80211_RADIOTAP_FLAGS) |
++				  (1 << IEEE80211_RADIOTAP_RATE) |
++				  (1 << IEEE80211_RADIOTAP_CHANNEL) |
++				  (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
++				  (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE) |
++				  (1 << IEEE80211_RADIOTAP_ANTENNA)),
++		      &iwl4965_rt->rt_hdr.it_present);
+ 
+ 	/* Zero the flags, we'll add to them as we go */
+ 	iwl4965_rt->rt_flags = 0;
+ 
+-	put_unaligned_le64(tsf, &iwl4965_rt->rt_tsf);
++	put_unaligned(cpu_to_le64(tsf), &iwl4965_rt->rt_tsf);
+ 
+ 	iwl4965_rt->rt_dbmsignal = signal;
+ 	iwl4965_rt->rt_dbmnoise = noise;
+@@ -853,14 +854,17 @@ static void iwl_add_radiotap(struct iwl_
+ 	/* Convert the channel frequency and set the flags */
+ 	put_unaligned(cpu_to_le16(stats->freq), &iwl4965_rt->rt_channelMHz);
+ 	if (!(phy_flags_hw & RX_RES_PHY_FLAGS_BAND_24_MSK))
+-		put_unaligned_le16(IEEE80211_CHAN_OFDM | IEEE80211_CHAN_5GHZ,
+-				   &iwl4965_rt->rt_chbitmask);
++		put_unaligned(cpu_to_le16(IEEE80211_CHAN_OFDM |
++					  IEEE80211_CHAN_5GHZ),
++			      &iwl4965_rt->rt_chbitmask);
+ 	else if (phy_flags_hw & RX_RES_PHY_FLAGS_MOD_CCK_MSK)
+-		put_unaligned_le16(IEEE80211_CHAN_CCK | IEEE80211_CHAN_2GHZ,
+-				   &iwl4965_rt->rt_chbitmask);
++		put_unaligned(cpu_to_le16(IEEE80211_CHAN_CCK |
++					  IEEE80211_CHAN_2GHZ),
++			      &iwl4965_rt->rt_chbitmask);
+ 	else	/* 802.11g */
+-		put_unaligned_le16(IEEE80211_CHAN_OFDM | IEEE80211_CHAN_2GHZ,
+-				   &iwl4965_rt->rt_chbitmask);
++		put_unaligned(cpu_to_le16(IEEE80211_CHAN_OFDM |
++					  IEEE80211_CHAN_2GHZ),
++			      &iwl4965_rt->rt_chbitmask);
+ 
+ 	if (rate == -1)
+ 		iwl4965_rt->rt_rate = 0;
 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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c	2008-07-10 14:00:03.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig	2008-07-15 16:17:35.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c	2008-07-15 16:20:32.000000000 -0400
 @@ -523,7 +523,7 @@ static int lbs_process_bss(struct bss_de
  
  	if (*bytesleft >= sizeof(beaconsize)) {
@@ -664,8 +725,8 @@
  	pos += 2;
  
 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-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c	2008-07-10 13:57:45.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig	2008-07-15 16:17:50.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c	2008-07-15 16:20:32.000000000 -0400
 @@ -430,16 +430,15 @@ static int __init init_mac80211_hwsim(vo
  		hwsim_radios[i] = hw;
  
@@ -687,8 +748,8 @@
  		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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c	2008-07-10 13:57:46.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig	2008-07-15 16:17:35.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c	2008-07-15 16:20:32.000000000 -0400
 @@ -557,11 +557,11 @@ static void handle_rx_packet(struct zd_u
  	 * be padded. Unaligned access might also happen if the length_info
  	 * structure is not present.
@@ -704,8 +765,8 @@
  				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-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/include/linux/input.h	2008-07-10 13:57:46.000000000 -0400
+--- linux-2.6.25.noarch/include/linux/input.h.orig	2008-07-15 16:16:03.000000000 -0400
++++ linux-2.6.25.noarch/include/linux/input.h	2008-07-15 16:20:32.000000000 -0400
 @@ -638,6 +638,7 @@ struct input_absinfo {
  #define SW_TABLET_MODE		0x01  /* set = tablet mode */
  #define SW_HEADPHONE_INSERT	0x02  /* set = inserted */
@@ -715,9 +776,9 @@
  #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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/iface.c	2008-07-10 13:57:46.000000000 -0400
-@@ -53,15 +53,6 @@ int ieee80211_if_add(struct net_device *
+--- linux-2.6.25.noarch/net/mac80211/iface.c.orig	2008-07-15 16:17:50.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/iface.c	2008-07-15 16:20:32.000000000 -0400
+@@ -181,15 +181,6 @@ int ieee80211_if_add(struct ieee80211_lo
  	if (!ndev)
  		return -ENOMEM;
  
@@ -734,8 +795,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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c	2008-07-10 13:57:46.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig	2008-07-15 16:17:35.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c	2008-07-15 16:20:32.000000000 -0400
 @@ -26,7 +26,7 @@ static inline u32 u32_field_get(u8 *preq
  {
  	if (ae)
@@ -746,8 +807,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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/michael.c	2008-07-10 13:57:46.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/michael.c.orig	2008-07-15 16:17:35.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/michael.c	2008-07-15 16:20:32.000000000 -0400
 @@ -39,17 +39,16 @@ static void michael_mic_hdr(struct micha
  	else
  		tid = 0;
@@ -797,9 +858,21 @@
 +	mic[6] = (mctx.r >> 16) & 0xff;
 +	mic[7] = (mctx.r >> 24) & 0xff;
  }
+diff -up linux-2.6.25.noarch/net/mac80211/mlme.c.orig linux-2.6.25.noarch/net/mac80211/mlme.c
+--- linux-2.6.25.noarch/net/mac80211/mlme.c.orig	2008-07-15 16:31:52.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/mlme.c	2008-07-15 16:25:34.000000000 -0400
+@@ -345,7 +345,7 @@ static void ieee80211_sta_wmm_params(str
+ 		params.aifs = pos[0] & 0x0f;
+ 		params.cw_max = ecw2cw((pos[1] & 0xf0) >> 4);
+ 		params.cw_min = ecw2cw(pos[1] & 0x0f);
+-		params.txop = get_unaligned_le16(pos + 2);
++		params.txop = pos[2] | (pos[3] << 8);
+ #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+ 		printk(KERN_DEBUG "%s: WMM queue=%d aci=%d acm=%d aifs=%d "
+ 		       "cWmin=%d cWmax=%d txop=%d\n",
 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-07-10 13:57:40.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.c	2008-07-10 13:57:46.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig	2008-07-15 16:17:35.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.c	2008-07-15 16:20:32.000000000 -0400
 @@ -7,22 +7,23 @@
   * published by the Free Software Foundation.
   */
@@ -1004,8 +1077,8 @@
 +
 +
 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-07-10 13:57:41.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.c	2008-07-10 13:57:46.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig	2008-07-15 16:17:35.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.c	2008-07-15 16:20:32.000000000 -0400
 @@ -317,11 +317,13 @@ static void ccmp_special_blocks(struct s
  	memcpy(&b_0[2], hdr->addr2, ETH_ALEN);
  	memcpy(&b_0[8], pn, CCMP_PN_LEN);
@@ -1023,8 +1096,8 @@
  	memcpy(&aad[4], &hdr->addr1, 3 * ETH_ALEN);
  
 diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c
---- linux-2.6.25.noarch/net/socket.c.orig	2008-07-10 13:57:41.000000000 -0400
-+++ linux-2.6.25.noarch/net/socket.c	2008-07-10 13:57:46.000000000 -0400
+--- linux-2.6.25.noarch/net/socket.c.orig	2008-07-15 16:17:35.000000000 -0400
++++ linux-2.6.25.noarch/net/socket.c	2008-07-15 16:20:32.000000000 -0400
 @@ -2215,7 +2215,7 @@ static long compat_sock_ioctl(struct fil
  	struct net *net;
  
@@ -1035,8 +1108,8 @@
  	if (sock->ops->compat_ioctl)
  		ret = sock->ops->compat_ioctl(sock, cmd, arg);
 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-07-10 13:57:41.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c	2008-07-10 13:57:46.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig	2008-07-15 16:17:35.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c	2008-07-15 16:20:32.000000000 -0400
 @@ -167,13 +167,13 @@ int cfg80211_dev_rename(struct cfg80211_
  
  	/* Ignore nop renames */
@@ -1054,8 +1127,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-07-10 13:57:41.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/radiotap.c	2008-07-10 13:57:46.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig	2008-07-15 16:17:35.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/radiotap.c	2008-07-15 16:20:32.000000000 -0400
 @@ -59,21 +59,23 @@ int ieee80211_radiotap_iterator_init(
  		return -EINVAL;
  
@@ -1097,8 +1170,8 @@
  			} 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-07-10 13:57:41.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c	2008-07-10 13:57:46.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/wext.c.orig	2008-07-15 16:17:35.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/wext.c	2008-07-15 16:20:32.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.58 -r 1.59 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.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- linux-2.6-wireless-pending.patch	10 Jul 2008 18:26:02 -0000	1.58
+++ linux-2.6-wireless-pending.patch	16 Jul 2008 16:30:23 -0000	1.59
@@ -1,3 +1,501 @@
+commit 4c9adafff7d910f142fe44fae37ed12c6b99f20f
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date:   Sun Jul 13 10:07:48 2008 +0200
+
+    rt2x00: Reset LED assoc status after firmware update
+    
+    According to the legacy drivers the LED association status
+    must be reset after the firmware has been uploaded to the
+    hardware.
+    
+    Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 3eb2011a67b044859069359948579b942993c416
+Author: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
+Date:   Fri Jul 11 11:53:42 2008 +0800
+
+    iwlwifi: make index unsigned int for iwl_send_led_cmd
+    
+    This is a small fix to change the idx type from int to unsigned.
+    
+    Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 9a9ad0cda72a651fc6b99fa9ec040a5d41005a88
+Author: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
+Date:   Fri Jul 11 11:53:41 2008 +0800
+
+    iwlwifi: Fix LEDs for 3945
+    
+    The patch fixes LEDs problem for 3945.
+    
+    Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 36da7d70e307f8650db1b1c7350d2161ca3829ef
+Author: Zhu Yi <yi.zhu at intel.com>
+Date:   Fri Jul 11 11:53:40 2008 +0800
+
+    iwlwifi: send TXPOWER command after a new RXON command
+    
+    The patch fixes the problem that TXPOWER command is not sent
+    after we issue a new RXON command which requires a tune. Otherwise
+    we won't be able to Tx any frames.
+    
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit fe905f1d5a8404f45fa0df26e6a870bf1e3b5983
+Author: Tomas Winkler <tomas.winkler at intel.com>
+Date:   Fri Jul 11 11:53:39 2008 +0800
+
+    iwlwifi: enable active scanning
+    
+    This patch enables active scan on active channels.
+    
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit d16dc48a2ea14af9980d0ea79d041f4b53e47b62
+Author: Tomas Winkler <tomas.winkler at intel.com>
+Date:   Fri Jul 11 11:53:38 2008 +0800
+
+    iwlwifi: unify 4965 and 5000 scanning code
+    
+    This patch unifies 4965 and 5000 scanning code.
+    
+    We increases the version number to 1.3.27. Since new uCode
+    iwlwifi-4965-2.ucode is required for 4965 cards.
+    
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit ec1a746042ea4c1c93065185897d6e8d3e7de894
+Author: Tomas Winkler <tomas.winkler at intel.com>
+Date:   Fri Jul 11 11:53:37 2008 +0800
+
+    iwlwifi: LED use correctly blink table
+    
+    This patch makes correct usage of the LED blink table.
+    
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 0eee612731e133604023bfa8d20047e98160845e
+Author: Tomas Winkler <tomas.winkler at intel.com>
+Date:   Fri Jul 11 11:53:36 2008 +0800
+
+    iwlwifi: fix LED stall
+    
+    This patch fixes LED stall. last_blink_time was updated only if LED command
+    was sent, causing wrong computation of the througput.
+    Some code cleanup comes with this patch as well
+    
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 9f17b318a1e2335b45cf35ad6509b90e972c0e6b
+Author: Tomas Winkler <tomas.winkler at intel.com>
+Date:   Fri Jul 11 11:53:35 2008 +0800
+
+    iwlwifi: differentiate 4965 and 5000 hw ampdu queues number
+    
+    This patch asks to allocate the correct amount of sw queues according
+    to hw ampdu queues number.
+    
+    Signed-off-by: Ron Rindjunsky <ron.rindjunsky at intel.com>
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 1ff50bda6eef4466366e197541508fc69af0f0c0
+Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+Date:   Fri Jul 11 11:53:34 2008 +0800
+
+    iwlwifi: make iwl4965_mac_conf_tx in atomic context
+    
+    This patch fixes iwl4965_mac_conf_tx. A mutex was taken in atomic context
+    leading to Oops. This patch removes the mutex and extends the hold
+    priv->lock. None of the field of QOS is accessed without priv->lock held.
+    
+    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 6c5379077f47f6eff9c23caf8513751d2f582e72
+Author: Tomas Winkler <tomas.winkler at intel.com>
+Date:   Fri Jul 11 11:53:33 2008 +0800
+
+    iwlwifi: rs always set lq_sta->priv
+    
+    This patch fixes printk NULL pointer exceptions in rs code.
+    
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: Guy Cohen <guy.cohen at intel.com>
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 65fdbb48eb43e33e94239677a75422ddc6f5eb75
+Author: Tomas Winkler <tomas.winkler at intel.com>
+Date:   Fri Jul 11 11:53:32 2008 +0800
+
+    iwlwifi: remove post associate work
+    
+    This patch removes post associate work. It wasn't used.
+    
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit a326a5d096f031af46c0073dd78eb80dea1f311a
+Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+Date:   Fri Jul 11 11:53:31 2008 +0800
+
+    iwlwifi: fixes RTS / CTS support
+    
+    This patch fixes the RTS / CTS support in iwlwifi. 5000 will send CTS to
+    self when allowed by spec, 4965 will send RTS or CTS to self according to
+    mac80211 request.
+    
+    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 474086396276a01190974797a69a95fb14ae7cc9
+Author: Esti Kummer <stkumer at localhost.localdomain>
+Date:   Fri Jul 11 11:53:30 2008 +0800
+
+    iwlwifi: adding pci device ids to iwl_hw_card_ids
+    
+    The patch adds PCI device IDs to iwl_hw_card_ids.
+    
+    Signed-off-by: Esti Kummer <stkumer at localhost.localdomain>
+    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 4bd9b4f334c31a79bdfee4db5dbb6aa430090446
+Author: Adel Gadllah <adel.gadllah at gmail.com>
+Date:   Fri Jul 11 11:53:29 2008 +0800
+
+    iwl3965: remove useless network and duplicate checking
+    
[...17842 lines suppressed...]
 +
++	return 0;
++}
++
++static int ieee80211_ioctl_siwpower(struct net_device *dev,
++				    struct iw_request_info *info,
++				    struct iw_param *wrq,
++				    char *extra)
++{
++	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
++	struct ieee80211_conf *conf = &local->hw.conf;
++
++	if (wrq->disabled) {
++		conf->flags &= ~IEEE80211_CONF_PS;
++		return ieee80211_hw_config(local);
++	}
++
++	switch (wrq->flags & IW_POWER_MODE) {
++	case IW_POWER_ON:       /* If not specified */
++	case IW_POWER_MODE:     /* If set all mask */
++	case IW_POWER_ALL_R:    /* If explicitely state all */
++		conf->flags |= IEEE80211_CONF_PS;
++		break;
++	default:                /* Otherwise we don't support it */
++		return -EINVAL;
++	}
++
++	return ieee80211_hw_config(local);
++}
++
++static int ieee80211_ioctl_giwpower(struct net_device *dev,
++				    struct iw_request_info *info,
++				    union iwreq_data *wrqu,
++				    char *extra)
++{
++	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
++	struct ieee80211_conf *conf = &local->hw.conf;
++
++	wrqu->power.disabled = !(conf->flags & IEEE80211_CONF_PS);
++
  	return 0;
  }
  
-@@ -1015,8 +1077,8 @@ static struct iw_statistics *ieee80211_g
+@@ -1015,8 +1106,8 @@ static struct iw_statistics *ieee80211_g
  		wstats->qual.noise = 0;
  		wstats->qual.updated = IW_QUAL_ALL_INVALID;
  	} else {
@@ -79912,9 +84158,20 @@
  		wstats->qual.noise = sta->last_noise;
  		wstats->qual.updated = local->wstats_flags;
  	}
+@@ -1149,8 +1240,8 @@ static const iw_handler ieee80211_handle
+ 	(iw_handler) ieee80211_ioctl_giwretry,		/* SIOCGIWRETRY */
+ 	(iw_handler) ieee80211_ioctl_siwencode,		/* SIOCSIWENCODE */
+ 	(iw_handler) ieee80211_ioctl_giwencode,		/* SIOCGIWENCODE */
+-	(iw_handler) NULL,				/* SIOCSIWPOWER */
+-	(iw_handler) NULL,				/* SIOCGIWPOWER */
++	(iw_handler) ieee80211_ioctl_siwpower,		/* SIOCSIWPOWER */
++	(iw_handler) ieee80211_ioctl_giwpower,		/* SIOCGIWPOWER */
+ 	(iw_handler) NULL,				/* -- hole -- */
+ 	(iw_handler) NULL,				/* -- hole -- */
+ 	(iw_handler) ieee80211_ioctl_siwgenie,		/* SIOCSIWGENIE */
 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-07-09 10:52:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.c	2008-07-09 10:52:48.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.c.orig	2008-07-15 16:16:12.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.c	2008-07-15 16:17:35.000000000 -0400
 @@ -19,16 +19,22 @@
  #include "wme.h"
  
@@ -80329,8 +84586,8 @@
  		skb = qdisc->dequeue(qdisc);
  		root_qd->q.qlen--;
 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-07-09 10:52:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.h	2008-07-09 10:52:48.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.h.orig	2008-07-15 16:16:12.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.h	2008-07-15 16:17:35.000000000 -0400
 @@ -19,19 +19,11 @@
  #define QOS_CONTROL_ACK_POLICY_NORMAL 0
  #define QOS_CONTROL_ACK_POLICY_NOACK 1
@@ -80353,8 +84610,8 @@
  int ieee80211_qdisc_installed(struct net_device *dev);
  int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
 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-07-09 10:52:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.c	2008-07-09 10:52:48.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig	2008-07-15 16:16:12.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.c	2008-07-15 16:17:35.000000000 -0400
 @@ -11,6 +11,8 @@
  #include <linux/slab.h>
  #include <linux/skbuff.h>
@@ -81000,8 +85257,8 @@
  		}
  	}
 diff -up linux-2.6.25.noarch/net/rfkill/rfkill.c.orig linux-2.6.25.noarch/net/rfkill/rfkill.c
---- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig	2008-07-09 10:52:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/rfkill/rfkill.c	2008-07-09 10:52:48.000000000 -0400
+--- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig	2008-07-15 16:16:12.000000000 -0400
++++ linux-2.6.25.noarch/net/rfkill/rfkill.c	2008-07-15 16:17:35.000000000 -0400
 @@ -39,8 +39,56 @@ MODULE_LICENSE("GPL");
  static LIST_HEAD(rfkill_list);	/* list of registered rf switches */
  static DEFINE_MUTEX(rfkill_mutex);
@@ -81474,8 +85731,8 @@
  }
  
 diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.c
---- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig	2008-07-09 10:52:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c	2008-07-09 10:52:43.000000000 -0400
+--- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig	2008-07-15 16:16:12.000000000 -0400
++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c	2008-07-15 16:17:35.000000000 -0400
 @@ -30,39 +30,62 @@ struct rfkill_task {
  	spinlock_t lock; /* for accessing last and desired state */
  	unsigned long last; /* last schedule */
@@ -81633,8 +85890,8 @@
  };
  
 diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.h
---- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig	2008-07-09 10:52:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h	2008-07-09 10:52:43.000000000 -0400
+--- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig	2008-07-15 16:16:12.000000000 -0400
++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h	2008-07-15 16:17:35.000000000 -0400
 @@ -12,5 +12,6 @@
  #define __RFKILL_INPUT_H
  
@@ -81643,8 +85900,8 @@
  
  #endif /* __RFKILL_INPUT_H */
 diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c
---- linux-2.6.25.noarch/net/socket.c.orig	2008-07-09 10:52:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/socket.c	2008-07-09 10:52:43.000000000 -0400
+--- linux-2.6.25.noarch/net/socket.c.orig	2008-07-15 16:16:12.000000000 -0400
++++ linux-2.6.25.noarch/net/socket.c	2008-07-15 16:17:35.000000000 -0400
 @@ -90,6 +90,7 @@
  #include <asm/unistd.h>
  
@@ -81674,8 +85931,8 @@
  }
  #endif
 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-07-09 10:52:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c	2008-07-09 10:52:43.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig	2008-07-15 16:16:12.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c	2008-07-15 16:17:35.000000000 -0400
 @@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re
  int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
  			char *newname)
@@ -81738,9 +85995,27 @@
  }
  
  /* exported functions */
+diff -up linux-2.6.25.noarch/net/wireless/Kconfig.orig linux-2.6.25.noarch/net/wireless/Kconfig
+--- linux-2.6.25.noarch/net/wireless/Kconfig.orig	2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/Kconfig	2008-07-15 16:17:50.000000000 -0400
+@@ -29,3 +29,14 @@ config WIRELESS_EXT
+ 
+ 	  Say N (if you can) unless you know you need wireless
+ 	  extensions for external modules.
++
++config WIRELESS_EXT_SYSFS
++	bool "Wireless extensions sysfs files"
++	default y
++	depends on WIRELESS_EXT && SYSFS
++	help
++	  This option enables the deprecated wireless statistics
++	  files in /sys/class/net/*/wireless/. The same information
++	  is available via the ioctls as well.
++
++	  Say Y if you have programs using it (we don't know of any).
 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-07-09 10:42:31.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/nl80211.c	2008-07-09 10:52:48.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig	2008-07-15 16:16:12.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/nl80211.c	2008-07-15 16:17:35.000000000 -0400
 @@ -198,12 +198,14 @@ static int nl80211_dump_wiphy(struct sk_
  
  	mutex_lock(&cfg80211_drv_mutex);
@@ -81759,8 +86034,8 @@
  	mutex_unlock(&cfg80211_drv_mutex);
  
 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-07-09 10:52:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/radiotap.c	2008-07-09 10:52:43.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig	2008-07-15 16:16:12.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/radiotap.c	2008-07-15 16:17:35.000000000 -0400
 @@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init(
  		return -EINVAL;
  
@@ -81802,8 +86077,8 @@
  			} 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-07-09 10:52:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c	2008-07-09 10:52:43.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/wext.c.orig	2008-07-15 16:16:12.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/wext.c	2008-07-15 16:17:35.000000000 -0400
 @@ -500,7 +500,7 @@ static int call_commit_handler(struct ne
  /*
   * Calculate size of private arguments




More information about the fedora-extras-commits mailing list