rpms/kernel/F-9 config-generic, 1.106, 1.107 kernel.spec, 1.709, 1.710 linux-2.6-wireless-fixups.patch, 1.8, 1.9 linux-2.6-wireless-pending.patch, 1.57, 1.58 linux-2.6-wireless.patch, 1.45, 1.46
John W. Linville (linville)
fedora-extras-commits at redhat.com
Thu Jul 10 18:26:55 UTC 2008
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32329
Modified Files:
config-generic kernel.spec linux-2.6-wireless-fixups.patch
linux-2.6-wireless-pending.patch linux-2.6-wireless.patch
Log Message:
Upstream wireless fixes from 2008-07-09 ; Upstream wireless updates from 2008-07-08
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- config-generic 2 Jul 2008 22:04:18 -0000 1.106
+++ config-generic 10 Jul 2008 18:26:02 -0000 1.107
@@ -1316,6 +1316,7 @@
CONFIG_IWL5000=y
CONFIG_IWL5000_RUN_TIME_CALIB=y
CONFIG_IWL3945=m
+CONFIG_IWL3945_RFKILL=y
CONFIG_IWL3945_DEBUG=y
CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
CONFIG_IWL3945_QOS=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.709
retrieving revision 1.710
diff -u -r1.709 -r1.710
--- kernel.spec 10 Jul 2008 16:23:27 -0000 1.709
+++ kernel.spec 10 Jul 2008 18:26:02 -0000 1.710
@@ -1877,6 +1877,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
+* Thu Jul 10 2008 John W. Linville <linville at redhat.com> 2.6.25.9-91
+- Upstream wireless fixes from 2008-07-09
+ (http://marc.info/?l=linux-netdev&m=121563769208664&w=2)
+- Upstream wireless updates from 2008-07-08
+ (http://marc.info/?l=linux-wireless&m=121554411325041&w=2)
+
* Thu Jul 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.10-90
- libata: don't let ata_piix driver attach to ICH6M in ahci mode (#430916)
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-wireless-fixups.patch 4 Jul 2008 20:21:44 -0000 1.8
+++ linux-2.6-wireless-fixups.patch 10 Jul 2008 18:26:02 -0000 1.9
@@ -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-01 14:22:15.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-01 14:24:27.000000000 -0400
+--- 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
@@ -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-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
+--- 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
@@ -58,6 +58,10 @@
#include "reg.h"
#include "debug.h"
@@ -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-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
+--- 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
@@ -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-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
+--- 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
@@ -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-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
+--- 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
@@ -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-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
+--- 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
@@ -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-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
+--- 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
@@ -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-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
+--- 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
@@ -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-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
+--- 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
@@ -1211,10 +1211,10 @@ static void handle_irq_noise(struct b43_
/* Get the noise samples. */
B43_WARN_ON(dev->noisecalc.nr_samples >= 8);
@@ -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-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
+--- 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
@@ -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-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
+--- 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
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-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
+--- 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
@@ -523,7 +523,7 @@ static int lbs_process_bss(struct bss_de
if (*bytesleft >= sizeof(beaconsize)) {
@@ -649,9 +649,23 @@
*bytesleft -= sizeof(beaconsize);
*pbeaconinfo += sizeof(beaconsize);
}
+@@ -567,11 +567,11 @@ static int lbs_process_bss(struct bss_de
+ pos += 8;
+
+ /* beacon interval is 2 bytes long */
+- bss->beaconperiod = get_unaligned_le16(pos);
++ bss->beaconperiod = le16_to_cpup((void *) pos);
+ pos += 2;
+
+ /* capability information is 2 bytes long */
+- bss->capability = get_unaligned_le16(pos);
++ bss->capability = le16_to_cpup((void *) pos);
+ lbs_deb_scan("process_bss: capabilities 0x%04x\n", bss->capability);
+ 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-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
+--- 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
@@ -430,16 +430,15 @@ static int __init init_mac80211_hwsim(vo
hwsim_radios[i] = hw;
@@ -673,9 +687,9 @@
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-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
+--- 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
+@@ -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.
*/
@@ -690,8 +704,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-01 14:23:01.000000000 -0400
-+++ linux-2.6.25.noarch/include/linux/input.h 2008-07-01 14:23:41.000000000 -0400
+--- 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
@@ -638,6 +638,7 @@ struct input_absinfo {
#define SW_TABLET_MODE 0x01 /* set = tablet mode */
#define SW_HEADPHONE_INSERT 0x02 /* set = inserted */
@@ -701,8 +715,8 @@
#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-01 14:22:17.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/iface.c 2008-07-01 14:24:27.000000000 -0400
+--- 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 *
if (!ndev)
return -ENOMEM;
@@ -720,8 +734,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-01 14:22:17.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c 2008-07-01 14:24:27.000000000 -0400
+--- 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
@@ -26,7 +26,7 @@ static inline u32 u32_field_get(u8 *preq
{
if (ae)
@@ -732,12 +746,12 @@
/* 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-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)
- {
+--- 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
+@@ -39,17 +39,16 @@ static void michael_mic_hdr(struct micha
+ else
+ tid = 0;
+
- mctx->l = get_unaligned_le32(key);
- mctx->r = get_unaligned_le32(key + 4);
+ mctx->l = key[0] | key[1] << 8 | key[2] << 16 | key[3] << 24;
@@ -754,10 +768,10 @@
+ michael_block(mctx, da[0] | da[1] << 8 | da[2] << 16 | da[3] << 24);
+ michael_block(mctx, da[4] | da[5] << 8 | sa[0] << 16 | sa[1] << 24);
+ michael_block(mctx, sa[2] | sa[3] << 8 | sa[4] << 16 | sa[5] << 24);
- michael_block(mctx, priority);
+ michael_block(mctx, tid);
}
-@@ -57,7 +56,9 @@ void michael_mic(const u8 *key, const u8
+@@ -67,7 +66,9 @@ void michael_mic(const u8 *key, struct i
left = data_len % 4;
for (block = 0; block < blocks; block++)
@@ -768,7 +782,7 @@
/* Partial block of 0..3 bytes and padding: 0x5a + 4..7 zeros to make
* total length a multiple of 4. */
-@@ -71,6 +72,12 @@ void michael_mic(const u8 *key, const u8
+@@ -81,6 +82,12 @@ void michael_mic(const u8 *key, struct i
michael_block(&mctx, val);
michael_block(&mctx, 0);
@@ -784,8 +798,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-07-01 14:22:17.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-01 14:24:27.000000000 -0400
+--- 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
@@ -7,22 +7,23 @@
* published by the Free Software Foundation.
*/
@@ -989,9 +1003,40 @@
}
+
+
+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
+@@ -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);
+ /* l(m) */
+- put_unaligned_be16(data_len, &b_0[14]);
++ b_0[14] = (data_len >> 8) & 0xff;
++ b_0[15] = data_len & 0xff;
+
+ /* AAD (extra authenticate-only data) / masked 802.11 header
+ * FC | A1 | A2 | A3 | SC | [A4] | [QC] */
+- put_unaligned_be16(len_a, &aad[0]);
++ aad[0] = 0; /* (len_a >> 8) & 0xff; */
++ aad[1] = len_a & 0xff;
+ put_unaligned(mask_fc, (__le16 *)&aad[2]);
+ 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
+@@ -2215,7 +2215,7 @@ static long compat_sock_ioctl(struct fil
+ struct net *net;
+
+ sk = sock->sk;
+- net = sock_net(sk);
++ net = sk->sk_net;
+
+ 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-01 14:22:17.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-01 14:24:27.000000000 -0400
+--- 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
@@ -167,13 +167,13 @@ int cfg80211_dev_rename(struct cfg80211_
/* Ignore nop renames */
@@ -1009,8 +1054,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-01 14:22:17.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-01 14:24:27.000000000 -0400
+--- 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
@@ -59,21 +59,23 @@ int ieee80211_radiotap_iterator_init(
return -EINVAL;
@@ -1052,8 +1097,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-01 14:22:17.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-01 14:24:27.000000000 -0400
+--- 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
@@ -1299,7 +1299,7 @@ static void rtmsg_iwinfo(struct net_devi
struct sk_buff *skb;
int err;
@@ -1063,15 +1108,3 @@
return;
skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
-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-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/net/socket.c 2008-06-30 14:05:20.000000000 -0400
-@@ -2215,7 +2215,7 @@ static long compat_sock_ioctl(struct fil
- struct net *net;
-
- sk = sock->sk;
-- net = sock_net(sk);
-+ net = sk->sk_net;
-
- if (sock->ops->compat_ioctl)
- ret = sock->ops->compat_ioctl(sock, cmd, arg);
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.57 -r 1.58 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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- linux-2.6-wireless-pending.patch 8 Jul 2008 17:28:29 -0000 1.57
+++ linux-2.6-wireless-pending.patch 10 Jul 2008 18:26:02 -0000 1.58
@@ -1,3 +1,541 @@
+commit b46372710ab536c0967f76be5dc41341583d4a54
+Author: Julius Volz <juliusv at google.com>
+Date: Tue Jul 8 14:02:19 2008 +0200
+
+ net/wireless/nl80211.c: fix endless Netlink callback loop.
+
+ Although I only tested similar code (I don't use any of this wireless
+ code), the state maintainance between Netlink dump callback invocations
+ seems wrong here and should lead to an endless loop. There are also other
+ examples in the same file which might have the same problem. Perhaps someone
+ can actually test this (or refute my logic).
+
+ Take the simple example with only one element in the list (which should fit
+ into the message):
+
+ 1. invocation:
+ Start:
+ idx = 0, start = 0
+ Loop:
+ condition (++idx < start) => (1 < 0) => false
+ => no continue, fill one entry, exit loop, return skb->len > 0
+
+ 2. invocation:
+ Start:
+ idx = 0, start = 1
+ Loop:
+ condition (++idx < start) => (1 < 1) => false
+ => no continue, fill the same entry again, exit loop, return skb->len > 0
+
+ 3. invocation:
+ Same as 2. invocation, endless invocation of callback.
+
+ Also, iterations where the filling of an element fails should not be counted as
+ completed, so idx should not be incremented in this case.
+
+ Signed-off-by: Julius Volz <juliusv at google.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 0e25b4ef220f6ef4eed120543182385b13005db9
+Author: Larry Finger <Larry.Finger at lwfinger.net>
+Date: Tue Jul 8 09:43:43 2008 -0500
+
+ rtl8187: Change detection of RTL8187B with USB ID of 8187
+
+ Some early versions of RTL8187B devices have a USB ID of 0x8187
+ rather than the 0x8189 of later models. In addition, it appears
+ that these early units also must be programmed with lower power.
+ Previous patches used the Product ID string to detect this situation,
+ but did not address the low power question. This patch uses the
+ hardware version and sets the power accordingly.
+
+ Signed-off-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
+ Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 5c036b217a1fe3ae0616e9c43c6bcd13b3c134b6
+Author: Hin-Tak Leung <hintak.leung at gmail.com>
+Date: Tue Jul 8 12:38:02 2008 +0100
+
+ rtl8187: updating Kconfig to support RTL8187B
+
+ Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+ Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
+ Signed-off-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
+ Signed-off-by: Pavel Roskin <proski at gnu.org>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 6f7853f3cbe457067e9fe05461f56c7ea4ac488c
+Author: Hin-Tak Leung <hintak.leung at gmail.com>
+Date: Tue Jul 8 12:36:04 2008 +0100
+
+ rtl8187: change rtl8187_dev.c to support RTL8187B (part 2)
+
+ Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+ Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
+ Signed-off-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
+ Signed-off-by: Pavel Roskin <proski at gnu.org>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit f8a08c34265b59710a8fc049911f487477c19fab
+Author: Hin-Tak Leung <hintak.leung at gmail.com>
+Date: Tue Jul 8 12:33:34 2008 +0100
+
+ rtl8187: change rtl8187_dev.c to support RTL8187B (part 1)
+
+ Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+ Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
+ Signed-off-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
+ Signed-off-by: Pavel Roskin <proski at gnu.org>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit e7d414ff21a7e0b00295e838c004ff1de5fba6ce
+Author: Hin-Tak Leung <hintak.leung at gmail.com>
+Date: Tue Jul 8 12:31:57 2008 +0100
+
+ rtl8187: updating rtl8187_rtl8225.c to support RTL8187B
+
+ Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+ Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
+ Signed-off-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
+ Signed-off-by: Pavel Roskin <proski at gnu.org>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit d1e11af51657d18222bef9cc15591f8c0f289186
+Author: Hin-Tak Leung <hintak.leung at gmail.com>
+Date: Tue Jul 8 12:30:02 2008 +0100
+
+ rtl8187: updating rtl818x.h to support RTL8187B
+
+ Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+ Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
+ Signed-off-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
+ Signed-off-by: Pavel Roskin <proski at gnu.org>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit c44ac0b9855c62b5ec8af5935124cfbe6654a32d
+Author: Hin-Tak Leung <hintak.leung at gmail.com>
+Date: Tue Jul 8 12:27:54 2008 +0100
+
+ rtl8187: updating rtl8187.h to support RTL8187B
+
+ Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+ Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
+ Signed-off-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
+ Signed-off-by: Pavel Roskin <proski at gnu.org>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 84263b0c94431e686552a322ae84678fddd22ebd
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Sun Jul 6 17:09:48 2008 +0200
+
+ rt2x00: Fix register comments
+
+ Fix some register documentation in the register header files.
+ This allows better parsing by userspace scripts which in turn
+ helps debugging.
+
+ Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 0ac2a00c1035c749b720c4d817beea1795f02d47
+Author: Pavel Roskin <proski at gnu.org>
+Date: Sun Jul 6 09:12:30 2008 -0400
+
+ hostap: don't compile prism2_suspend() for hostap_pci without CONFIG_PM
+
+ Signed-off-by: Pavel Roskin <proski at gnu.org>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 70197ede33134725f3e2e606fcabc28b0a4549a3
+Author: Larry Finger <Larry.Finger at lwfinger.net>
+Date: Fri Jul 4 08:39:01 2008 -0500
+
+ b43legacy: Remove switch statement with 64-bit index
+
+ The gcc 3.4 fork used to compile the MN10300 port emits unwanted
+ __ucmpdi2() calls for switch statements that use a 64bit value.
+
+ This patch removes such a switch from b43legacy, and makes the code
+ more like that used in b43. Thanks to Adrian Bunk <bunk at kernel.org>
+ for reporting the problem.
+
+ Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit ae73e58ea64f121b26437a10937330e77ff48f33
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Fri Jul 4 16:14:59 2008 +0200
+
+ rt2x00: Report RX end time for rt2400pci
+
+ rt2400 is the only currently available rt2x00 driver which
+ supports reporting of the RX end time for frames.
+ Since mac80211 uses this information for IBSS syncing, it
+ is important that it is being reported.
+
+ v2: Complement 32 bits of RX timestamp with upper 32bits from TSF
+
+ Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 8e260c22238dd8b57aefb1f5e4bd114486a9c17d
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Fri Jul 4 13:41:31 2008 +0200
+
+ rt2x00: Use ieee80211_hw->workqueue again
+
+ Remove the rt2x00 singlethreaded workqueue and move
+ the link tuner and packet filter scheduled work to
+ the ieee80211_hw->workqueue again.
+ The only exception is the interface scheduled work
[...11262 lines suppressed...]
list_for_each_entry(rfkill, &rfkill_list, node) {
if ((!rfkill->user_claim) && (rfkill->type == type))
@@ -77781,7 +81243,7 @@
static ssize_t rfkill_name_show(struct device *dev,
struct device_attribute *attr,
char *buf)
-@@ -109,31 +284,31 @@ static ssize_t rfkill_name_show(struct d
+@@ -109,31 +286,31 @@ static ssize_t rfkill_name_show(struct d
return sprintf(buf, "%s\n", rfkill->name);
}
@@ -77817,19 +81279,19 @@
BUG();
}
+}
-+
+
+- return sprintf(buf, "%s\n", type);
+static ssize_t rfkill_type_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct rfkill *rfkill = to_rfkill(dev);
-
-- return sprintf(buf, "%s\n", type);
++
+ return sprintf(buf, "%s\n", rfkill_get_type_str(rfkill->type));
}
static ssize_t rfkill_state_show(struct device *dev,
-@@ -142,6 +317,7 @@ static ssize_t rfkill_state_show(struct
+@@ -142,6 +319,7 @@ static ssize_t rfkill_state_show(struct
{
struct rfkill *rfkill = to_rfkill(dev);
@@ -77837,7 +81299,7 @@
return sprintf(buf, "%d\n", rfkill->state);
}
-@@ -156,10 +332,14 @@ static ssize_t rfkill_state_store(struct
+@@ -156,10 +334,14 @@ static ssize_t rfkill_state_store(struct
if (!capable(CAP_NET_ADMIN))
return -EPERM;
@@ -77854,7 +81316,7 @@
mutex_unlock(&rfkill->mutex);
return error ? error : count;
-@@ -200,7 +380,8 @@ static ssize_t rfkill_claim_store(struct
+@@ -200,7 +382,8 @@ static ssize_t rfkill_claim_store(struct
if (rfkill->user_claim != claim) {
if (!claim)
rfkill_toggle_radio(rfkill,
@@ -77864,7 +81326,7 @@
rfkill->user_claim = claim;
}
-@@ -233,12 +414,12 @@ static int rfkill_suspend(struct device
+@@ -233,12 +416,12 @@ static int rfkill_suspend(struct device
if (dev->power.power_state.event != state.event) {
if (state.event & PM_EVENT_SLEEP) {
@@ -77882,7 +81344,7 @@
mutex_unlock(&rfkill->mutex);
}
-@@ -255,8 +436,8 @@ static int rfkill_resume(struct device *
+@@ -255,8 +438,8 @@ static int rfkill_resume(struct device *
if (dev->power.power_state.event != PM_EVENT_ON) {
mutex_lock(&rfkill->mutex);
@@ -77893,7 +81355,7 @@
mutex_unlock(&rfkill->mutex);
}
-@@ -269,12 +450,51 @@ static int rfkill_resume(struct device *
+@@ -269,34 +452,71 @@ static int rfkill_resume(struct device *
#define rfkill_resume NULL
#endif
@@ -77945,16 +81407,25 @@
};
static int rfkill_add_switch(struct rfkill *rfkill)
-@@ -283,7 +503,7 @@ static int rfkill_add_switch(struct rfki
-
+ {
+- int error;
+-
mutex_lock(&rfkill_mutex);
- error = rfkill_toggle_radio(rfkill, rfkill_states[rfkill->type]);
-+ error = rfkill_toggle_radio(rfkill, rfkill_states[rfkill->type], 0);
- if (!error)
- list_add_tail(&rfkill->node, &rfkill_list);
+- if (!error)
+- list_add_tail(&rfkill->node, &rfkill_list);
++ rfkill_toggle_radio(rfkill, rfkill_states[rfkill->type], 0);
++
++ list_add_tail(&rfkill->node, &rfkill_list);
+
+ mutex_unlock(&rfkill_mutex);
-@@ -296,7 +516,7 @@ static void rfkill_remove_switch(struct
+- return error;
++ return 0;
+ }
+
+ static void rfkill_remove_switch(struct rfkill *rfkill)
{
mutex_lock(&rfkill_mutex);
list_del_init(&rfkill->node);
@@ -78003,8 +81474,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-08 13:06:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-08 13:08:57.000000000 -0400
+--- 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
@@ -30,39 +30,62 @@ struct rfkill_task {
spinlock_t lock; /* for accessing last and desired state */
unsigned long last; /* last schedule */
@@ -78162,8 +81633,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-08 13:06:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-08 13:08:57.000000000 -0400
+--- 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
@@ -12,5 +12,6 @@
#define __RFKILL_INPUT_H
@@ -78172,8 +81643,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-08 13:06:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/socket.c 2008-07-08 13:08:57.000000000 -0400
+--- 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
@@ -90,6 +90,7 @@
#include <asm/unistd.h>
@@ -78203,8 +81674,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-08 13:06:47.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-08 13:08:57.000000000 -0400
+--- 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
@@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re
int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
char *newname)
@@ -78267,9 +81738,29 @@
}
/* exported functions */
+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
+@@ -198,12 +198,14 @@ static int nl80211_dump_wiphy(struct sk_
+
+ mutex_lock(&cfg80211_drv_mutex);
+ list_for_each_entry(dev, &cfg80211_drv_list, list) {
+- if (++idx < start)
++ if (++idx <= start)
+ continue;
+ if (nl80211_send_wiphy(skb, NETLINK_CB(cb->skb).pid,
+ cb->nlh->nlmsg_seq, NLM_F_MULTI,
+- dev) < 0)
++ dev) < 0) {
++ idx--;
+ break;
++ }
+ }
+ 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-08 13:06:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-08 13:08:57.000000000 -0400
+--- 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
@@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init(
return -EINVAL;
@@ -78311,8 +81802,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-08 13:06:47.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-08 13:08:57.000000000 -0400
+--- 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
@@ -500,7 +500,7 @@ static int call_commit_handler(struct ne
/*
* Calculate size of private arguments
linux-2.6-wireless.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.45 -r 1.46 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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- linux-2.6-wireless.patch 8 Jul 2008 17:28:30 -0000 1.45
+++ linux-2.6-wireless.patch 10 Jul 2008 18:26:02 -0000 1.46
@@ -1,3 +1,62 @@
+commit 814feefa859a736d29d0700d49debf13904b429f
+Author: Ihar Hrachyshka <ihar.hrachyshka at promwad.com>
+Date: Wed Jul 9 09:29:58 2008 +0300
+
+ libertas: fix memory alignment problems on the blackfin
+
+ Fixing unaligned memory access on the blackfin architecture.
+
+ Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka at promwad.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 86229f0c7b4e065f51b5572a8a61801e281740a0
+Author: Luis Carlos Cobo <luisca at cozybit.com>
+Date: Tue Jul 8 16:19:21 2008 +0200
+
+ zd1211rw: stop beacons on remove_interface
+
+ If a mesh or ad-hoc interface is brought up and later it is replaced
+ by managed interface, the managed interface will keep transmitting
+ the beacons that were configured for the former interface. This patch
+ fixes that behaviour.
+
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 1f90916264049a7d9e6106fd60d289c9a775d24f
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Tue Jul 8 13:45:20 2008 +0200
+
+ rt2x00: Disable synchronization during initialization
+
+ As soon as init_registers() was called, the rt2400/rt2500
+ would start raising beacondone interrupts. Since this is highly
+ premature since no beacons were provided yet, we should
+ initialize the synchronization register to 0.
+
+ This will make all drivers initialize it to 0 regardless
+ if they are raising beacondone interrupts or not, since it only
+ makes sense to have it completely disabled.
+
+ Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit adeed48090fc370afa0db8d007748ee72a40b578
+Author: Mattias Nissler <mattias.nissler at gmx.de>
+Date: Mon Jul 7 23:08:19 2008 +0200
+
+ rc80211_pid: Fix fast_start parameter handling
+
+ This removes the fast_start parameter from the rc_pid parameters
+ information and instead uses the parameter macro when initializing
+ the rc_pid state. Since the parameter is only used on initialization,
+ there is no point of making exporting it via debugfs. This also fixes
+ uninitialized memory references to the fast_start and norm_offset
+ parameters detected by the kmemcheck utility. Thanks to Vegard Nossum
+ for reporting the bug.
+
+ Signed-off-by: Mattias Nissler <mattias.nissler at gmx.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
commit 6e43829bb69bf1d584a592075f1357590eb49b1a
Author: Vladimir Koutny <vlado at work.ksp.sk>
Date: Mon Jul 7 14:23:01 2008 +0200
@@ -9356,8 +9415,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-07-08 13:06:19.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-08 13:06:46.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-10 13:43:10.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-10 13:43:33.000000000 -0400
@@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_
{ 0 }
};
@@ -9555,8 +9614,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-07-08 13:06:19.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-08 13:06:46.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-10 13:43:10.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-10 13:43:33.000000000 -0400
@@ -534,61 +534,6 @@ struct adm8211_eeprom {
u8 cis_data[0]; /* 0x80, 384 bytes */
} __attribute__ ((packed));
@@ -9644,8 +9703,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-07-08 13:06:19.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-08 13:06:46.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-10 13:43:10.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-10 13:43:33.000000000 -0400
@@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(s
dev->irq = ethdev->irq;
dev->base_addr = ethdev->base_addr;
@@ -9900,8 +9959,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-07-08 13:06:19.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-08 13:06:46.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-10 13:43:10.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-10 13:43:33.000000000 -0400
@@ -30,7 +30,6 @@
#include <net/mac80211.h>
@@ -10251,8 +10310,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-07-08 13:06:19.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-08 13:06:46.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-10 13:43:10.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-10 13:43:33.000000000 -0400
@@ -58,10 +58,6 @@
#include "reg.h"
#include "debug.h"
@@ -11306,8 +11365,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-07-08 13:06:19.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-08 13:06:46.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-07-10 13:43:10.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-10 13:43:33.000000000 -0400
@@ -83,7 +83,7 @@ struct ath5k_txq {
#if CHAN_DEBUG
#define ATH_CHAN_MAX (26+26+26+200+200)
@@ -11353,8 +11412,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-07-08 13:06:19.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-08 13:06:46.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-10 13:43:10.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-10 13:43:33.000000000 -0400
@@ -65,7 +65,7 @@ static unsigned int ath5k_debug;
module_param_named(debug, ath5k_debug, uint, 0);
@@ -11529,8 +11588,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-07-08 13:06:19.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-08 13:06:46.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-10 13:43:10.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-10 13:43:33.000000000 -0400
@@ -61,11 +61,6 @@
#ifndef _ATH5K_DEBUG_H
#define _ATH5K_DEBUG_H
@@ -11615,8 +11674,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-07-08 13:06:19.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-08 13:06:46.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-10 13:43:10.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-10 13:43:33.000000000 -0400
@@ -1,4 +1,4 @@
- /*
+/*
@@ -13211,8 +13270,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-07-08 13:06:19.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-08 13:06:46.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-10 13:43:10.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-10 13:43:33.000000000 -0400
@@ -173,7 +173,10 @@ struct ath5k_eeprom_info {
* (rX: reserved fields possibily used by future versions of the ar5k chipset)
*/
@@ -13414,8 +13473,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-07-08 13:06:19.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-08 13:06:46.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-10 13:43:10.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-10 13:43:33.000000000 -0400
@@ -678,8 +678,8 @@ static const struct ath5k_ini ar5212_ini
{ AR5K_PHY(644), 0x00806333 },
{ AR5K_PHY(645), 0x00106c10 },
@@ -13938,8 +13997,8 @@
}
diff -up /dev/null linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig
---- /dev/null 2008-07-08 08:02:22.375004777 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-08 13:06:46.000000000 -0400
+--- /dev/null 2008-07-10 09:23:32.996002867 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-10 13:43:33.000000000 -0400
[...4475 lines suppressed...]
#include <linux/list.h>
#include <linux/types.h>
@@ -125839,8 +126082,8 @@
#endif /* STA_INFO_H */
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-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-10 13:43:34.000000000 -0400
@@ -12,7 +12,7 @@
#include <linux/netdevice.h>
@@ -125938,8 +126181,8 @@
tkip_mixing_phase2(key->u.tkip.p1k_rx[queue],
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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-10 13:43:34.000000000 -0400
@@ -11,7 +11,7 @@
#include <linux/types.h>
@@ -125959,8 +126202,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-10 13:43:34.000000000 -0400
@@ -25,11 +25,12 @@
#include <asm/unaligned.h>
@@ -127415,8 +127658,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-10 13:43:34.000000000 -0400
@@ -25,7 +25,8 @@
#include <net/rtnetlink.h>
@@ -127735,8 +127978,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-10 13:43:34.000000000 -0400
@@ -305,39 +305,39 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_
return NULL;
}
@@ -127827,8 +128070,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-10 13:43:34.000000000 -0400
@@ -14,7 +14,7 @@
#include <linux/skbuff.h>
#include <linux/types.h>
@@ -127853,8 +128096,8 @@
#endif /* WEP_H */
diff -up /dev/null linux-2.6.25.noarch/net/mac80211/wext.c
---- /dev/null 2008-07-08 08:02:22.375004777 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-08 13:06:47.000000000 -0400
+--- /dev/null 2008-07-10 09:23:32.996002867 -0400
++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-10 13:43:34.000000000 -0400
@@ -0,0 +1,1171 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -129028,8 +129271,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-10 13:43:34.000000000 -0400
@@ -19,10 +19,13 @@
#include "wme.h"
@@ -129239,8 +129482,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-10 13:43:34.000000000 -0400
@@ -24,6 +24,8 @@
#define QOS_CONTROL_TAG1D_MASK 0x07
@@ -129286,8 +129529,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-10 13:43:34.000000000 -0400
@@ -70,8 +70,8 @@ static int ieee80211_get_hdr_info(const
}
@@ -129667,8 +129910,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-10 13:43:34.000000000 -0400
@@ -13,19 +13,19 @@
#include <linux/types.h>
#include "ieee80211_i.h"
@@ -129702,8 +129945,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-10 13:43:34.000000000 -0400
@@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy)
{
struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy);
@@ -129753,8 +129996,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-10 13:43:34.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);
@@ -129764,8 +130007,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-10 13:43:34.000000000 -0400
@@ -1,5 +1,5 @@
obj-$(CONFIG_WIRELESS_EXT) += wext.o
obj-$(CONFIG_CFG80211) += cfg80211.o
@@ -129774,8 +130017,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-10 13:43:34.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,
@@ -130466,8 +130709,8 @@
/* multicast groups */
diff -up /dev/null linux-2.6.25.noarch/net/wireless/reg.c
---- /dev/null 2008-07-08 08:02:22.375004777 -0400
-+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-08 13:06:47.000000000 -0400
+--- /dev/null 2008-07-10 09:23:32.996002867 -0400
++++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-10 13:43:34.000000000 -0400
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -130650,8 +130893,8 @@
+ handle_band(wiphy->bands[band], rd);
+}
diff -up /dev/null linux-2.6.25.noarch/net/wireless/util.c
---- /dev/null 2008-07-08 08:02:22.375004777 -0400
-+++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-08 13:06:47.000000000 -0400
+--- /dev/null 2008-07-10 09:23:32.996002867 -0400
++++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-10 13:43:34.000000000 -0400
@@ -0,0 +1,121 @@
+/*
+ * Wireless utility functions
@@ -130775,8 +131018,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-07-08 13:06:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-08 13:06:47.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-10 13:43:11.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-10 13:43:34.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