rpms/kernel/devel kernel.spec, 1.267, 1.268 linux-2.6-wireless-pending.patch, 1.13, 1.14 linux-2.6-wireless.patch, 1.12, 1.13 linux-2.6-iwlwifi-cve-2007-5938.patch, 1.1, NONE
John W. Linville (linville)
fedora-extras-commits at redhat.com
Fri Nov 30 15:27:01 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1984
Modified Files:
kernel.spec linux-2.6-wireless-pending.patch
linux-2.6-wireless.patch
Removed Files:
linux-2.6-iwlwifi-cve-2007-5938.patch
Log Message:
Some wireless bits headed for 2.6.24
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- kernel.spec 30 Nov 2007 14:55:05 -0000 1.267
+++ kernel.spec 30 Nov 2007 15:26:27 -0000 1.268
@@ -609,7 +609,6 @@
Patch670: linux-2.6-ata-quirk.patch
Patch680: linux-2.6-wireless.patch
Patch681: linux-2.6-wireless-pending.patch
-Patch682: linux-2.6-iwlwifi-cve-2007-5938.patch
Patch690: linux-2.6-at76.patch
Patch691: linux-2.6-ath5k.patch
Patch692: linux-2.6-zd1211rw-mac80211.patch
@@ -1101,13 +1100,10 @@
ApplyPatch linux-2.6-ata-quirk.patch
# wireless patches headed for 2.6.24
-#ApplyPatch linux-2.6-wireless.patch
+ApplyPatch linux-2.6-wireless.patch
# wireless patches headed for 2.6.25
ApplyPatch linux-2.6-wireless-pending.patch
-# fix CVE-2007-5938
-ApplyPatch linux-2.6-iwlwifi-cve-2007-5938.patch
-
# Add misc wireless bits from upstream wireless tree
ApplyPatch linux-2.6-at76.patch
ApplyPatch linux-2.6-ath5k.patch
@@ -1716,6 +1712,9 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
%changelog
+* Fri Nov 30 2007 John W. Linville <linville at redhat.com>
+- Some wireless bits headed for 2.6.24
+
* Fri Nov 30 2007 Kyle McMartin <kmcmartin at redhat.com>
- 2.6.24-rc3-git5
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.13 -r 1.14 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-wireless-pending.patch 29 Nov 2007 20:24:14 -0000 1.13
+++ linux-2.6-wireless-pending.patch 30 Nov 2007 15:26:27 -0000 1.14
@@ -1,6 +1,6 @@
diff -up linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c
---- linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig 2007-11-30 09:03:19.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2007-11-30 10:03:38.000000000 -0500
@@ -27,6 +27,7 @@ static const struct pci_device_id b43_pc
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) },
@@ -10,8 +10,8 @@
};
MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
diff -up linux-2.6.23.noarch/drivers/ssb/pci.c.orig linux-2.6.23.noarch/drivers/ssb/pci.c
---- linux-2.6.23.noarch/drivers/ssb/pci.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pci.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/pci.c.orig 2007-11-30 09:03:19.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pci.c 2007-11-30 10:03:38.000000000 -0500
@@ -212,29 +212,29 @@ static inline u8 ssb_crc8(u8 crc, u8 dat
return t[crc ^ data];
}
@@ -402,8 +402,8 @@
err = -EINVAL;
goto out_kfree;
diff -up linux-2.6.23.noarch/drivers/ssb/main.c.orig linux-2.6.23.noarch/drivers/ssb/main.c
---- linux-2.6.23.noarch/drivers/ssb/main.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/main.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/main.c.orig 2007-11-30 09:03:19.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/main.c 2007-11-30 10:03:38.000000000 -0500
@@ -872,14 +872,22 @@ EXPORT_SYMBOL(ssb_clockspeed);
static u32 ssb_tmslow_reject_bitmask(struct ssb_device *dev)
@@ -429,8 +429,8 @@
}
return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23);
diff -up linux-2.6.23.noarch/drivers/net/b44.c.orig linux-2.6.23.noarch/drivers/net/b44.c
---- linux-2.6.23.noarch/drivers/net/b44.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/b44.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/b44.c.orig 2007-11-30 09:03:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/b44.c 2007-11-30 10:03:38.000000000 -0500
@@ -2060,11 +2060,11 @@ static int __devinit b44_get_invariants(
if (sdev->bus->bustype == SSB_BUSTYPE_SSB &&
@@ -448,8 +448,8 @@
memcpy(bp->dev->dev_addr, addr, 6);
diff -up linux-2.6.23.noarch/drivers/net/wireless/atmel.c.orig linux-2.6.23.noarch/drivers/net/wireless/atmel.c
---- linux-2.6.23.noarch/drivers/net/wireless/atmel.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/atmel.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/atmel.c.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/atmel.c 2007-11-30 10:03:38.000000000 -0500
@@ -1759,7 +1759,7 @@ static int atmel_set_encode(struct net_d
priv->default_key = index;
} else
@@ -460,8 +460,8 @@
}
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/p54pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/p54pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/p54pci.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/p54pci.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/p54pci.c.orig 2007-11-30 09:03:17.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/p54pci.c 2007-11-30 10:03:38.000000000 -0500
@@ -141,6 +141,7 @@ static irqreturn_t p54p_simple_interrupt
static int p54p_read_eeprom(struct ieee80211_hw *dev)
{
@@ -683,8 +683,8 @@
static int __devinit p54p_probe(struct pci_dev *pdev,
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h 2007-11-30 10:03:38.000000000 -0500
@@ -542,6 +542,10 @@ struct b43_phy {
u16 lofcal;
@@ -698,7 +698,7 @@
/* Data structures for DMA transmission, per 80211 core. */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/b43/wa.h
--- /dev/null 2007-11-21 18:00:15.874485932 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/wa.h 2007-11-29 15:07:30.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/wa.h 2007-11-30 10:03:38.000000000 -0500
@@ -0,0 +1,7 @@
+#ifndef B43_WA_H_
+#define B43_WA_H_
@@ -708,8 +708,8 @@
+
+#endif /* B43_WA_H_ */
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile.orig linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile
---- linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile 2007-11-30 10:03:38.000000000 -0500
@@ -5,6 +5,7 @@ b43-y += phy.o
b43-y += sysfs.o
b43-y += xmit.o
@@ -719,8 +719,8 @@
b43-$(CONFIG_B43_RFKILL) += rfkill.o
# b43 LED support
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/main.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/main.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/main.c.orig 2007-11-30 10:01:44.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.c 2007-11-30 10:03:38.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43 wireless driver
@@ -1133,7 +1133,7 @@
wl = hw_to_b43_wl(hw);
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/b43/wa.c
--- /dev/null 2007-11-21 18:00:15.874485932 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/wa.c 2007-11-29 15:07:30.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/wa.c 2007-11-30 10:03:38.000000000 -0500
@@ -0,0 +1,665 @@
+/*
+
@@ -1801,8 +1801,8 @@
+ b43_wa_cpll_nonpilot(dev);
+}
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/main.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43/main.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43/main.h.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.h 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/main.h.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.h 2007-11-30 10:03:38.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43 wireless driver
@@ -1813,8 +1813,8 @@
Danny van Dyk <kugelfang at gentoo.org>
Andreas Jaggi <andreas.jaggi at waterwave.ch>
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c 2007-11-30 10:03:38.000000000 -0500
@@ -5,7 +5,7 @@
Transmission (TX/RX) related functions.
@@ -1851,8 +1851,8 @@
if (in_rssi > 63)
in_rssi = 63;
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c 2007-11-30 10:03:38.000000000 -0500
@@ -352,7 +352,7 @@ static ssize_t b43_debugfs_read(struct f
struct b43_wldev *dev;
struct b43_debugfs_fops *dfops;
@@ -1863,8 +1863,8 @@
const size_t bufsize = 1024 * 128;
const size_t buforder = get_order(bufsize);
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c.orig 2007-11-30 10:01:44.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c 2007-11-30 10:03:38.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43 wireless driver
@@ -2719,8 +2719,8 @@
{
struct b43_phy *phy = &dev->phy;
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h 2007-11-30 10:03:38.000000000 -0500
@@ -27,8 +27,11 @@ struct b43_phy;
#define B43_PHY_PWRDOWN B43_PHY_OFDM(0x03) /* Powerdown */
#define B43_PHY_CRSTHRES1 B43_PHY_OFDM(0x06) /* CRS Threshold 1 */
@@ -2780,8 +2780,8 @@
#define B43_OFDMTAB_WRSSI_R1 B43_OFDMTAB(0x15, 4)
#define B43_OFDMTAB_TSSI B43_OFDMTAB(0x15, 0)
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/leds.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/leds.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/leds.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/leds.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/leds.c.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/leds.c 2007-11-30 10:03:38.000000000 -0500
@@ -4,7 +4,7 @@
LED control
@@ -2807,8 +2807,8 @@
for (i = 0; i < 4; i++) {
if (sprom[i] == 0xFF) {
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/tables.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43/tables.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43/tables.h.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/tables.h 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/tables.h.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/tables.h 2007-11-30 10:03:38.000000000 -0500
@@ -1,9 +1,9 @@
#ifndef B43_TABLES_H_
#define B43_TABLES_H_
[...5920 lines suppressed...]
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2007-11-30 10:01:44.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c 2007-11-30 10:03:38.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43legacy wireless driver
@@ -45115,8 +45113,8 @@
phy->idle_tssi = 62;
dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.h.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.h 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.h.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.h 2007-11-30 10:03:38.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43legacy wireless driver
@@ -45127,8 +45125,8 @@
Danny van Dyk <kugelfang at gentoo.org>
Andreas Jaggi <andreas.jaggi at waterwave.ch>
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c 2007-11-30 10:03:38.000000000 -0500
@@ -1,13 +1,13 @@
/*
@@ -45595,8 +45593,8 @@
+ b43legacy_unregister_led(&dev->led_assoc);
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h 2007-11-30 10:03:38.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43legacy wireless driver
@@ -45617,7 +45615,7 @@
int synthetic_pu_workaround);
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.h
--- /dev/null 2007-11-21 18:00:15.874485932 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.h 2007-11-29 15:07:30.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.h 2007-11-30 10:03:38.000000000 -0500
@@ -0,0 +1,59 @@
+#ifndef B43legacy_RFKILL_H_
+#define B43legacy_RFKILL_H_
@@ -45679,8 +45677,8 @@
+
+#endif /* B43legacy_RFKILL_H_ */
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h 2007-11-30 10:03:38.000000000 -0500
@@ -1,30 +1,33 @@
#ifndef B43legacy_LEDS_H_
#define B43legacy_LEDS_H_
@@ -45769,7 +45767,7 @@
#endif /* B43legacy_LEDS_H_ */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c
--- /dev/null 2007-11-21 18:00:15.874485932 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c 2007-11-29 15:07:30.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c 2007-11-30 10:03:38.000000000 -0500
@@ -0,0 +1,189 @@
+/*
+
@@ -45961,8 +45959,8 @@
+ rfk->rfkill = NULL;
+}
diff -up linux-2.6.23.noarch/drivers/net/wireless/orinoco.c.orig linux-2.6.23.noarch/drivers/net/wireless/orinoco.c
---- linux-2.6.23.noarch/drivers/net/wireless/orinoco.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/orinoco.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/orinoco.c.orig 2007-11-30 09:03:17.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/orinoco.c 2007-11-30 10:03:38.000000000 -0500
@@ -270,6 +270,37 @@ static inline void set_port_type(struct
}
}
@@ -46614,8 +46612,8 @@
return err;
}
diff -up linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c.orig linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c
---- linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c.orig 2007-11-30 09:03:28.000000000 -0500
++++ linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c 2007-11-30 10:03:38.000000000 -0500
@@ -709,7 +709,7 @@ int ieee80211_wx_get_encodeext(struct ie
} else
idx = ieee->tx_keyidx;
@@ -46626,8 +46624,8 @@
if (idx != 0 || ieee->iw_mode != IW_MODE_INFRA)
return -EINVAL;
diff -up linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c.orig linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c
---- linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c 2007-11-29 15:07:45.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-11-30 09:03:28.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c 2007-11-30 10:03:38.000000000 -0500
@@ -513,7 +513,6 @@ static int ieee80211_ioctl_siwscan(struc
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
@@ -46702,8 +46700,8 @@
ieee80211_hw_config(local);
/* The return value of hw_config is not of big interest here,
diff -up linux-2.6.23.noarch/net/mac80211/ieee80211_i.h.orig linux-2.6.23.noarch/net/mac80211/ieee80211_i.h
---- linux-2.6.23.noarch/net/mac80211/ieee80211_i.h.orig 2007-11-29 15:00:25.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211_i.h 2007-11-29 15:07:45.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/ieee80211_i.h.orig 2007-11-30 09:03:28.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/ieee80211_i.h 2007-11-30 10:03:38.000000000 -0500
@@ -483,10 +483,6 @@ struct ieee80211_local {
struct list_head sta_bss_list;
struct ieee80211_sta_bss *sta_bss_hash[STA_HASH_SIZE];
@@ -46716,8 +46714,8 @@
/* SNMP counters */
/* dot11CountersTable */
diff -up linux-2.6.23.noarch/net/mac80211/util.c.orig linux-2.6.23.noarch/net/mac80211/util.c
---- linux-2.6.23.noarch/net/mac80211/util.c.orig 2007-11-29 15:00:25.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/util.c 2007-11-29 15:07:45.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/util.c.orig 2007-11-30 09:03:28.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/util.c 2007-11-30 10:03:38.000000000 -0500
@@ -22,6 +22,7 @@
#include <linux/bitmap.h>
#include <net/net_namespace.h>
@@ -46763,8 +46761,8 @@
+}
+EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces);
diff -up linux-2.6.23.noarch/net/mac80211/tx.c.orig linux-2.6.23.noarch/net/mac80211/tx.c
---- linux-2.6.23.noarch/net/mac80211/tx.c.orig 2007-11-29 15:00:25.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/tx.c 2007-11-29 15:07:45.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/tx.c.orig 2007-11-30 09:03:28.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/tx.c 2007-11-30 10:03:39.000000000 -0500
@@ -1527,64 +1527,6 @@ int ieee80211_subif_start_xmit(struct sk
return ret;
}
@@ -46831,8 +46829,8 @@
void ieee80211_clear_tx_pending(struct ieee80211_local *local)
diff -up linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c
---- linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c.orig 2007-11-29 15:00:34.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c 2007-11-29 15:07:45.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c.orig 2007-11-30 09:03:32.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c 2007-11-30 10:03:39.000000000 -0500
@@ -2898,15 +2898,6 @@ ieee80211_sta_scan_result(struct net_dev
if (!(local->enabled_modes & (1 << bss->hw_mode)))
return current_ev;
@@ -46860,8 +46858,8 @@
if (!buf)
break;
diff -up linux-2.6.23.noarch/include/net/mac80211.h.orig linux-2.6.23.noarch/include/net/mac80211.h
---- linux-2.6.23.noarch/include/net/mac80211.h.orig 2007-11-29 15:00:18.000000000 -0500
-+++ linux-2.6.23.noarch/include/net/mac80211.h 2007-11-29 15:07:45.000000000 -0500
+--- linux-2.6.23.noarch/include/net/mac80211.h.orig 2007-11-30 09:03:26.000000000 -0500
++++ linux-2.6.23.noarch/include/net/mac80211.h 2007-11-30 10:03:39.000000000 -0500
@@ -1406,4 +1406,20 @@ void ieee80211_wake_queues(struct ieee80
*/
void ieee80211_scan_completed(struct ieee80211_hw *hw);
@@ -46884,8 +46882,8 @@
+
#endif /* MAC80211_H */
diff -up linux-2.6.23.noarch/include/linux/ieee80211.h.orig linux-2.6.23.noarch/include/linux/ieee80211.h
---- linux-2.6.23.noarch/include/linux/ieee80211.h.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ieee80211.h 2007-11-29 15:07:45.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ieee80211.h.orig 2007-11-30 09:03:26.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ieee80211.h 2007-11-30 10:03:39.000000000 -0500
@@ -54,6 +54,8 @@
#define IEEE80211_STYPE_ACTION 0x00D0
@@ -47103,8 +47101,8 @@
#define WLAN_CIPHER_SUITE_USE_GROUP 0x000FAC00
#define WLAN_CIPHER_SUITE_WEP40 0x000FAC01
diff -up linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h.orig linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h
---- linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h.orig 2007-11-30 09:03:26.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2007-11-30 10:03:39.000000000 -0500
@@ -147,6 +147,10 @@
#define SSB_IDLOW_SSBREV 0xF0000000 /* Sonics Backplane Revision code */
#define SSB_IDLOW_SSBREV_22 0x00000000 /* <= 2.2 */
@@ -47205,8 +47203,8 @@
enum {
SSB_SPROM1CCODE_WORLD = 0,
diff -up linux-2.6.23.noarch/include/linux/ssb/ssb.h.orig linux-2.6.23.noarch/include/linux/ssb/ssb.h
---- linux-2.6.23.noarch/include/linux/ssb/ssb.h.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ssb/ssb.h.orig 2007-11-30 09:03:26.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2007-11-30 10:03:39.000000000 -0500
@@ -15,22 +15,14 @@ struct pcmcia_device;
struct ssb_bus;
struct ssb_driver;
@@ -47309,8 +47307,8 @@
/* List of devices (cores) on the backplane. */
diff -up linux-2.6.23.noarch/MAINTAINERS.orig linux-2.6.23.noarch/MAINTAINERS
---- linux-2.6.23.noarch/MAINTAINERS.orig 2007-11-29 15:07:23.000000000 -0500
-+++ linux-2.6.23.noarch/MAINTAINERS 2007-11-29 15:07:30.000000000 -0500
+--- linux-2.6.23.noarch/MAINTAINERS.orig 2007-11-30 09:03:30.000000000 -0500
++++ linux-2.6.23.noarch/MAINTAINERS 2007-11-30 10:03:39.000000000 -0500
@@ -2027,10 +2027,12 @@ W: http://sourceforge.net/projects/e1000
S: Supported
linux-2.6-wireless.patch:
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-wireless.patch 21 Nov 2007 20:06:42 -0000 1.12
+++ linux-2.6-wireless.patch 30 Nov 2007 15:26:27 -0000 1.13
@@ -1,232 +1,356 @@
-diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2007-11-21 13:41:14.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2007-11-21 14:02:49.000000000 -0500
-@@ -1251,7 +1251,7 @@ static void rt73usb_write_tx_desc(struct
+diff -up linux-2.6.23.noarch/drivers/net/wireless/p54usb.c.orig linux-2.6.23.noarch/drivers/net/wireless/p54usb.c
+--- linux-2.6.23.noarch/drivers/net/wireless/p54usb.c.orig 2007-11-30 09:03:17.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/p54usb.c 2007-11-30 09:42:24.000000000 -0500
+@@ -308,7 +308,7 @@ static int p54u_read_eeprom(struct ieee8
+
+ buf = kmalloc(0x2020, GFP_KERNEL);
+ if (!buf) {
+- printk(KERN_ERR "prism54usb: cannot allocate memory for"
++ printk(KERN_ERR "prism54usb: cannot allocate memory for "
+ "eeprom readback!\n");
+ return -ENOMEM;
+ }
+diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/main.c
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/main.c.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.c 2007-11-30 09:42:24.000000000 -0500
+@@ -1566,7 +1566,7 @@ static void b43_release_firmware(struct
+ static void b43_print_fw_helptext(struct b43_wl *wl)
+ {
+ b43err(wl, "You must go to "
+- "http://linuxwireless.org/en/users/Drivers/bcm43xx#devicefirmware "
++ "http://linuxwireless.org/en/users/Drivers/b43#devicefirmware "
+ "and download the correct firmware (version 4).\n");
}
- static int rt73usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
-- int maxpacket, struct sk_buff *skb)
-+ struct sk_buff *skb)
- {
- int length;
+diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c 2007-11-30 09:42:24.000000000 -0500
+@@ -2214,7 +2214,7 @@ int b43_phy_init_tssi2dbm_table(struct b
+ }
+ dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
+ if (dyn_tssi2dbm == NULL) {
+- b43err(dev->wl, "Could not allocate memory"
++ b43err(dev->wl, "Could not allocate memory "
+ "for tssi2dbm table\n");
+ return -ENOMEM;
+ }
+diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2007-11-30 09:03:17.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2007-11-30 09:42:24.000000000 -0500
+@@ -2915,6 +2915,10 @@ static void iwl_set_rate(struct iwl_priv
+ int i;
+
+ hw = iwl_get_hw_mode(priv, priv->phymode);
++ if (!hw) {
++ IWL_ERROR("Failed to set rate: unable to get hw mode\n");
++ return;
++ }
+
+ priv->active_rate = 0;
+ priv->active_rate_basic = 0;
+@@ -6936,13 +6940,10 @@ static int iwl_mac_add_interface(struct
+ DECLARE_MAC_BUF(mac);
+
+ IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);
+- if (conf->mac_addr)
+- IWL_DEBUG_MAC80211("enter: MAC %s\n",
+- print_mac(mac, conf->mac_addr));
+
+ if (priv->interface_id) {
+ IWL_DEBUG_MAC80211("leave - interface_id != 0\n");
+- return 0;
++ return -EOPNOTSUPP;
+ }
-@@ -1260,7 +1260,7 @@ static int rt73usb_get_tx_data_len(struc
- * but it must _not_ be a multiple of the USB packet size.
- */
- length = roundup(skb->len, 4);
-- length += (4 * !(length % maxpacket));
-+ length += (4 * !(length % rt2x00dev->usb_maxpacket));
+ spin_lock_irqsave(&priv->lock, flags);
+@@ -6951,6 +6952,12 @@ static int iwl_mac_add_interface(struct
+ spin_unlock_irqrestore(&priv->lock, flags);
- return length;
- }
-diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig 2007-11-21 13:41:14.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2007-11-21 14:02:49.000000000 -0500
-@@ -418,7 +418,7 @@ struct rt2x00lib_ops {
- int (*write_tx_data) (struct rt2x00_dev *rt2x00dev,
- struct data_ring *ring, struct sk_buff *skb,
- struct ieee80211_tx_control *control);
-- int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev, int maxpacket,
-+ int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev,
- struct sk_buff *skb);
- void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev,
- unsigned int queue);
-@@ -599,6 +599,11 @@ struct rt2x00_dev {
- u32 *rf;
-
- /*
-+ * USB Max frame size (for rt2500usb & rt73usb).
-+ */
-+ u16 usb_maxpacket;
+ mutex_lock(&priv->mutex);
+
-+ /*
- * Current TX power value.
- */
- u16 tx_power;
-diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig 2007-11-21 13:41:14.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c 2007-11-21 14:02:49.000000000 -0500
-@@ -159,7 +159,6 @@ int rt2x00usb_write_tx_data(struct rt2x0
- interface_to_usbdev(rt2x00dev_usb(rt2x00dev));
- struct data_entry *entry = rt2x00_get_data_entry(ring);
- int pipe = usb_sndbulkpipe(usb_dev, 1);
-- int max_packet = usb_maxpacket(usb_dev, pipe, 1);
- u32 length;
-
- if (rt2x00_ring_full(ring)) {
-@@ -194,8 +193,7 @@ int rt2x00usb_write_tx_data(struct rt2x0
- * length of the data to usb_fill_bulk_urb. Pass the skb
- * to the driver to determine what the length should be.
- */
-- length = rt2x00dev->ops->lib->get_tx_data_len(rt2x00dev,
-- max_packet, skb);
-+ length = rt2x00dev->ops->lib->get_tx_data_len(rt2x00dev, skb);
-
- /*
- * Initialize URB and send the frame to the device.
-@@ -490,6 +488,11 @@ int rt2x00usb_probe(struct usb_interface
- rt2x00dev->ops = ops;
- rt2x00dev->hw = hw;
-
-+ rt2x00dev->usb_maxpacket =
-+ usb_maxpacket(usb_dev, usb_sndbulkpipe(usb_dev, 1), 1);
-+ if (!rt2x00dev->usb_maxpacket)
-+ rt2x00dev->usb_maxpacket = 1;
++ if (conf->mac_addr) {
++ IWL_DEBUG_MAC80211("Set: %s\n", print_mac(mac, conf->mac_addr));
++ memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
++ }
+
- retval = rt2x00usb_alloc_reg(rt2x00dev);
- if (retval)
- goto exit_free_device;
-diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2007-11-21 13:41:14.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2007-11-21 14:02:49.000000000 -0500
-@@ -1032,7 +1032,7 @@ static void rt2500usb_write_tx_desc(stru
- }
+ iwl_set_mode(priv, conf->type);
- static int rt2500usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
-- int maxpacket, struct sk_buff *skb)
-+ struct sk_buff *skb)
+ IWL_DEBUG_MAC80211("leave\n");
+@@ -8270,6 +8277,7 @@ static void iwl_cancel_deferred_work(str
{
- int length;
+ iwl_hw_cancel_deferred_work(priv);
-@@ -1041,7 +1041,7 @@ static int rt2500usb_get_tx_data_len(str
- * but it must _not_ be a multiple of the USB packet size.
- */
- length = roundup(skb->len, 2);
-- length += (2 * !(length % maxpacket));
-+ length += (2 * !(length % rt2x00dev->usb_maxpacket));
++ cancel_delayed_work_sync(&priv->init_alive_start);
+ cancel_delayed_work(&priv->scan_check);
+ cancel_delayed_work(&priv->alive_start);
+ cancel_delayed_work(&priv->post_associate);
+diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2007-11-30 09:03:17.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2007-11-30 09:42:24.000000000 -0500
+@@ -3003,6 +3003,10 @@ static void iwl_set_rate(struct iwl_priv
+ int i;
+
+ hw = iwl_get_hw_mode(priv, priv->phymode);
++ if (!hw) {
++ IWL_ERROR("Failed to set rate: unable to get hw mode\n");
++ return;
++ }
+
+ priv->active_rate = 0;
+ priv->active_rate_basic = 0;
+@@ -7326,9 +7330,6 @@ static int iwl_mac_add_interface(struct
+ DECLARE_MAC_BUF(mac);
+
+ IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);
+- if (conf->mac_addr)
+- IWL_DEBUG_MAC80211("enter: MAC %s\n",
+- print_mac(mac, conf->mac_addr));
+
+ if (priv->interface_id) {
+ IWL_DEBUG_MAC80211("leave - interface_id != 0\n");
+@@ -7341,6 +7342,11 @@ static int iwl_mac_add_interface(struct
+ spin_unlock_irqrestore(&priv->lock, flags);
- return length;
+ mutex_lock(&priv->mutex);
++
++ if (conf->mac_addr) {
++ IWL_DEBUG_MAC80211("Set %s\n", print_mac(mac, conf->mac_addr));
++ memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
++ }
+ iwl_set_mode(priv, conf->type);
+
+ IWL_DEBUG_MAC80211("leave\n");
+@@ -8864,6 +8870,7 @@ static void iwl_cancel_deferred_work(str
+ {
+ iwl_hw_cancel_deferred_work(priv);
+
++ cancel_delayed_work_sync(&priv->init_alive_start);
+ cancel_delayed_work(&priv->scan_check);
+ cancel_delayed_work(&priv->alive_start);
+ cancel_delayed_work(&priv->post_associate);
+diff -up linux-2.6.23.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c.orig linux-2.6.23.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+--- linux-2.6.23.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c.orig 2007-10-09 16:31:38.000000000 -0400
++++ linux-2.6.23.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c 2007-11-30 09:42:24.000000000 -0500
+@@ -2149,7 +2149,7 @@ int bcm43xx_phy_init_tssi2dbm_table(stru
+ }
+ dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
+ if (dyn_tssi2dbm == NULL) {
+- printk(KERN_ERR PFX "Could not allocate memory"
++ printk(KERN_ERR PFX "Could not allocate memory "
+ "for tssi2dbm table\n");
+ return -ENOMEM;
+ }
+diff -up linux-2.6.23.noarch/drivers/net/wireless/netwave_cs.c.orig linux-2.6.23.noarch/drivers/net/wireless/netwave_cs.c
+--- linux-2.6.23.noarch/drivers/net/wireless/netwave_cs.c.orig 2007-11-30 09:03:17.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/netwave_cs.c 2007-11-30 09:42:24.000000000 -0500
+@@ -806,7 +806,7 @@ static int netwave_pcmcia_config(struct
+ for (i = 0; i < 6; i++)
+ dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i);
+
+- printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx"
++ printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx, "
+ "id %c%c, hw_addr %s\n",
+ dev->name, dev->base_addr, dev->irq,
+ (u_long) ramBase,
+diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/if_cs.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/if_cs.c
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/if_cs.c.orig 2007-11-30 09:03:17.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/if_cs.c 2007-11-30 09:42:24.000000000 -0500
+@@ -170,7 +170,8 @@ static int if_cs_poll_while_fw_download(
+ #define IF_CS_H_IC_TX_OVER 0x0001
+ #define IF_CS_H_IC_RX_OVER 0x0002
+ #define IF_CS_H_IC_DNLD_OVER 0x0004
+-#define IF_CS_H_IC_HOST_EVENT 0x0008
++#define IF_CS_H_IC_POWER_DOWN 0x0008
++#define IF_CS_H_IC_HOST_EVENT 0x0010
+ #define IF_CS_H_IC_MASK 0x001f
+
+ #define IF_CS_H_INT_MASK 0x00000004
+diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c.orig 2007-11-30 09:03:17.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c 2007-11-30 09:42:24.000000000 -0500
+@@ -1165,8 +1165,6 @@ wlan_private *libertas_add_card(void *ca
+ #ifdef WIRELESS_EXT
+ dev->wireless_handlers = (struct iw_handler_def *)&libertas_handler_def;
+ #endif
+-#define NETIF_F_DYNALLOC 16
+- dev->features |= NETIF_F_DYNALLOC;
+ dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
+ dev->set_multicast_list = libertas_set_multicast_list;
+
+@@ -1348,8 +1346,6 @@ int libertas_add_mesh(wlan_private *priv
+ #ifdef WIRELESS_EXT
+ mesh_dev->wireless_handlers = (struct iw_handler_def *)&mesh_handler_def;
+ #endif
+-#define NETIF_F_DYNALLOC 16
+-
+ /* Register virtual mesh interface */
+ ret = register_netdev(mesh_dev);
+ if (ret) {
+diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c.orig 2007-11-30 09:03:17.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c 2007-11-30 09:42:24.000000000 -0500
+@@ -1528,7 +1528,7 @@ static int wlan_set_encodeext(struct net
+ && (ext->key_len != KEY_LEN_WPA_TKIP))
+ || ((alg == IW_ENCODE_ALG_CCMP)
+ && (ext->key_len != KEY_LEN_WPA_AES))) {
+- lbs_deb_wext("invalid size %d for key of alg"
++ lbs_deb_wext("invalid size %d for key of alg "
+ "type %d\n",
+ ext->key_len,
+ alg);
+diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/dma.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/dma.c
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/dma.c.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/dma.c 2007-11-30 09:42:24.000000000 -0500
+@@ -996,7 +996,7 @@ int b43legacy_dma_init(struct b43legacy_
+
+ err = ssb_dma_set_mask(dev->dev, dmamask);
+ if (err) {
+-#ifdef BCM43XX_PIO
++#ifdef CONFIG_B43LEGACY_PIO
+ b43legacywarn(dev->wl, "DMA for this device not supported. "
+ "Falling back to PIO\n");
+ dev->__using_pio = 1;
+diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c 2007-11-30 09:42:24.000000000 -0500
+@@ -1419,7 +1419,7 @@ static void b43legacy_release_firmware(s
+ static void b43legacy_print_fw_helptext(struct b43legacy_wl *wl)
+ {
+ b43legacyerr(wl, "You must go to http://linuxwireless.org/en/users/"
+- "Drivers/bcm43xx#devicefirmware "
++ "Drivers/b43#devicefirmware "
+ "and download the correct firmware (version 3).\n");
}
-@@ -1643,7 +1643,6 @@ static int rt2500usb_beacon_update(struc
- struct data_entry *beacon;
- struct data_entry *guardian;
- int pipe = usb_sndbulkpipe(usb_dev, 1);
-- int max_packet = usb_maxpacket(usb_dev, pipe, 1);
- int length;
-
- /*
-@@ -1672,7 +1671,7 @@ static int rt2500usb_beacon_update(struc
- ring->desc_size),
- skb->len - ring->desc_size, control);
-
-- length = rt2500usb_get_tx_data_len(rt2x00dev, max_packet, skb);
-+ length = rt2500usb_get_tx_data_len(rt2x00dev, skb);
-
- usb_fill_bulk_urb(beacon->priv, usb_dev, pipe,
- skb->data, length, rt2500usb_beacondone, beacon);
-diff -up linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_tkip.c.orig linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_tkip.c
---- linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_tkip.c.orig 2007-11-21 14:02:25.000000000 -0500
-+++ linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_tkip.c 2007-11-21 14:02:29.000000000 -0500
-@@ -464,7 +464,7 @@ static int ieee80211_tkip_decrypt(struct
- pos += 8;
-
- if (tkip_replay_check(iv32, iv16, tkey->rx_iv32, tkey->rx_iv16)) {
-- if (net_ratelimit()) {
-+ if (ieee80211_ratelimit_debug(IEEE80211_DL_DROP)) {
- IEEE80211_DEBUG_DROP("TKIP: replay detected: STA=%s"
- " previous TSC %08x%04x received TSC "
- "%08x%04x\n", print_mac(mac, hdr->addr2),
-@@ -504,7 +504,7 @@ static int ieee80211_tkip_decrypt(struct
- * it needs to be recalculated for the next packet. */
- tkey->rx_phase1_done = 0;
- }
-- if (net_ratelimit()) {
-+ if (ieee80211_ratelimit_debug(IEEE80211_DL_DROP)) {
- IEEE80211_DEBUG_DROP("TKIP: ICV error detected: STA="
- "%s\n", print_mac(mac, hdr->addr2));
- }
-diff -up linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_ccmp.c.orig linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_ccmp.c
---- linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_ccmp.c.orig 2007-11-21 14:02:25.000000000 -0500
-+++ linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_ccmp.c 2007-11-21 14:02:29.000000000 -0500
-@@ -338,7 +338,7 @@ static int ieee80211_ccmp_decrypt(struct
- pos += 8;
-
- if (ccmp_replay_check(pn, key->rx_pn)) {
-- if (net_ratelimit()) {
-+ if (ieee80211_ratelimit_debug(IEEE80211_DL_DROP)) {
- IEEE80211_DEBUG_DROP("CCMP: replay detected: STA=%s "
- "previous PN %02x%02x%02x%02x%02x%02x "
- "received PN %02x%02x%02x%02x%02x%02x\n",
-diff -up linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c
---- linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c.orig 2007-11-21 14:02:25.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c 2007-11-21 14:02:29.000000000 -0500
-@@ -2647,7 +2647,7 @@ void ieee80211_scan_completed(struct iee
- local->sta_scanning = 0;
-
- if (ieee80211_hw_config(local))
-- printk(KERN_DEBUG "%s: failed to restore operational"
-+ printk(KERN_DEBUG "%s: failed to restore operational "
- "channel after scan\n", dev->name);
+diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2007-11-30 09:03:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c 2007-11-30 09:42:24.000000000 -0500
+@@ -2020,7 +2020,7 @@ int b43legacy_phy_init_tssi2dbm_table(st
+ phy->idle_tssi = 62;
+ dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
+ if (dyn_tssi2dbm == NULL) {
+- b43legacyerr(dev->wl, "Could not allocate memory"
++ b43legacyerr(dev->wl, "Could not allocate memory "
+ "for tssi2dbm table\n");
+ return -ENOMEM;
+ }
+diff -up linux-2.6.23.noarch/net/ieee80211/ieee80211_tx.c.orig linux-2.6.23.noarch/net/ieee80211/ieee80211_tx.c
+--- linux-2.6.23.noarch/net/ieee80211/ieee80211_tx.c.orig 2007-10-09 16:31:38.000000000 -0400
++++ linux-2.6.23.noarch/net/ieee80211/ieee80211_tx.c 2007-11-30 09:42:20.000000000 -0500
+@@ -144,7 +144,8 @@ static int ieee80211_copy_snap(u8 * data
+ snap->oui[1] = oui[1];
+ snap->oui[2] = oui[2];
+
+- *(u16 *) (data + SNAP_SIZE) = htons(h_proto);
++ h_proto = htons(h_proto);
++ memcpy(data + SNAP_SIZE, &h_proto, sizeof(u16));
-diff -up linux-2.6.23.noarch/net/mac80211/ieee80211.c.orig linux-2.6.23.noarch/net/mac80211/ieee80211.c
---- linux-2.6.23.noarch/net/mac80211/ieee80211.c.orig 2007-11-21 14:02:25.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211.c 2007-11-21 14:02:29.000000000 -0500
-@@ -267,6 +267,17 @@ static int ieee80211_open(struct net_dev
- tasklet_enable(&local->tasklet);
+ return SNAP_SIZE + sizeof(u16);
+ }
+diff -up linux-2.6.23.noarch/net/mac80211/wep.c.orig linux-2.6.23.noarch/net/mac80211/wep.c
+--- linux-2.6.23.noarch/net/mac80211/wep.c.orig 2007-11-30 09:03:28.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/wep.c 2007-11-30 09:42:20.000000000 -0500
+@@ -265,7 +265,8 @@ int ieee80211_wep_decrypt(struct ieee802
+ if (ieee80211_wep_decrypt_data(local->wep_rx_tfm, rc4key, klen,
+ skb->data + hdrlen + WEP_IV_LEN,
+ len)) {
+- printk(KERN_DEBUG "WEP decrypt failed (ICV)\n");
++ if (net_ratelimit())
++ printk(KERN_DEBUG "WEP decrypt failed (ICV)\n");
+ ret = -1;
}
-+ /*
-+ * set_multicast_list will be invoked by the networking core
-+ * which will check whether any increments here were done in
-+ * error and sync them down to the hardware as filter flags.
-+ */
-+ if (sdata->flags & IEEE80211_SDATA_ALLMULTI)
-+ atomic_inc(&local->iff_allmultis);
-+
-+ if (sdata->flags & IEEE80211_SDATA_PROMISC)
-+ atomic_inc(&local->iff_promiscs);
-+
- local->open_count++;
-
- netif_start_queue(dev);
-@@ -284,6 +295,18 @@ static int ieee80211_stop(struct net_dev
+diff -up linux-2.6.23.noarch/net/mac80211/rx.c.orig linux-2.6.23.noarch/net/mac80211/rx.c
+--- linux-2.6.23.noarch/net/mac80211/rx.c.orig 2007-11-30 09:03:28.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/rx.c 2007-11-30 09:42:20.000000000 -0500
+@@ -997,7 +997,7 @@ ieee80211_rx_h_drop_unencrypted(struct i
+ if (unlikely(!(rx->fc & IEEE80211_FCTL_PROTECTED) &&
+ (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
+ (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC &&
+- rx->sdata->drop_unencrypted &&
++ (rx->key || rx->sdata->drop_unencrypted) &&
+ (rx->sdata->eapol == 0 || !ieee80211_is_eapol(rx->skb)))) {
+ if (net_ratelimit())
+ printk(KERN_DEBUG "%s: RX non-WEP frame, but expected "
+diff -up linux-2.6.23.noarch/net/mac80211/ieee80211.c.orig linux-2.6.23.noarch/net/mac80211/ieee80211.c
+--- linux-2.6.23.noarch/net/mac80211/ieee80211.c.orig 2007-11-30 09:03:32.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/ieee80211.c 2007-11-30 09:42:20.000000000 -0500
+@@ -216,6 +216,7 @@ static int ieee80211_open(struct net_dev
+ res = local->ops->start(local_to_hw(local));
+ if (res)
+ return res;
++ ieee80211_hw_config(local);
+ }
- netif_stop_queue(dev);
+ switch (sdata->type) {
+@@ -232,7 +233,6 @@ static int ieee80211_open(struct net_dev
+ netif_tx_unlock_bh(local->mdev);
-+ /*
-+ * Don't count this interface for promisc/allmulti while it
-+ * is down. dev_mc_unsync() will invoke set_multicast_list
-+ * on the master interface which will sync these down to the
-+ * hardware as filter flags.
-+ */
-+ if (sdata->flags & IEEE80211_SDATA_ALLMULTI)
-+ atomic_dec(&local->iff_allmultis);
-+
-+ if (sdata->flags & IEEE80211_SDATA_PROMISC)
-+ atomic_dec(&local->iff_promiscs);
+ local->hw.conf.flags |= IEEE80211_CONF_RADIOTAP;
+- ieee80211_hw_config(local);
+ }
+ break;
+ case IEEE80211_IF_TYPE_STA:
+@@ -334,8 +334,7 @@ static int ieee80211_stop(struct net_dev
+ ieee80211_configure_filter(local);
+ netif_tx_unlock_bh(local->mdev);
+
+- local->hw.conf.flags |= IEEE80211_CONF_RADIOTAP;
+- ieee80211_hw_config(local);
++ local->hw.conf.flags &= ~IEEE80211_CONF_RADIOTAP;
+ }
+ break;
+ case IEEE80211_IF_TYPE_STA:
+@@ -357,6 +356,11 @@ static int ieee80211_stop(struct net_dev
+ cancel_delayed_work(&local->scan_work);
+ }
+ flush_workqueue(local->hw.workqueue);
+
- dev_mc_unsync(local->mdev, dev);
++ sdata->u.sta.flags &= ~IEEE80211_STA_PRIVACY_INVOKED;
++ kfree(sdata->u.sta.extra_ie);
++ sdata->u.sta.extra_ie = NULL;
++ sdata->u.sta.extra_ie_len = 0;
+ /* fall through */
+ default:
+ conf.if_id = dev->ifindex;
+diff -up linux-2.6.23.noarch/net/rfkill/rfkill.c.orig linux-2.6.23.noarch/net/rfkill/rfkill.c
+--- linux-2.6.23.noarch/net/rfkill/rfkill.c.orig 2007-11-30 09:03:28.000000000 -0500
++++ linux-2.6.23.noarch/net/rfkill/rfkill.c 2007-11-30 09:42:20.000000000 -0500
+@@ -60,11 +60,7 @@ static void rfkill_led_trigger(struct rf
+ static int rfkill_toggle_radio(struct rfkill *rfkill,
+ enum rfkill_state state)
+ {
+- int retval;
+-
+- retval = mutex_lock_interruptible(&rfkill->mutex);
+- if (retval)
+- return retval;
++ int retval = 0;
+
+ if (state != rfkill->state) {
+ retval = rfkill->toggle_radio(rfkill->data, state);
+@@ -74,7 +70,6 @@ static int rfkill_toggle_radio(struct rf
+ }
+ }
+
+- mutex_unlock(&rfkill->mutex);
+ return retval;
+ }
- /* down all dependent devices, that is VLANs */
-@@ -366,8 +389,8 @@ static void ieee80211_set_multicast_list
+@@ -158,12 +153,13 @@ static ssize_t rfkill_state_store(struct
+ if (!capable(CAP_NET_ADMIN))
+ return -EPERM;
+
++ if (mutex_lock_interruptible(&rfkill->mutex))
++ return -ERESTARTSYS;
+ error = rfkill_toggle_radio(rfkill,
+ state ? RFKILL_STATE_ON : RFKILL_STATE_OFF);
+- if (error)
+- return error;
++ mutex_unlock(&rfkill->mutex);
- allmulti = !!(dev->flags & IFF_ALLMULTI);
- promisc = !!(dev->flags & IFF_PROMISC);
-- sdata_allmulti = sdata->flags & IEEE80211_SDATA_ALLMULTI;
-- sdata_promisc = sdata->flags & IEEE80211_SDATA_PROMISC;
-+ sdata_allmulti = !!(sdata->flags & IEEE80211_SDATA_ALLMULTI);
-+ sdata_promisc = !!(sdata->flags & IEEE80211_SDATA_PROMISC);
-
- if (allmulti != sdata_allmulti) {
- if (dev->flags & IFF_ALLMULTI)
-diff -up linux-2.6.23.noarch/include/net/ieee80211.h.orig linux-2.6.23.noarch/include/net/ieee80211.h
---- linux-2.6.23.noarch/include/net/ieee80211.h.orig 2007-11-21 14:02:25.000000000 -0500
-+++ linux-2.6.23.noarch/include/net/ieee80211.h 2007-11-21 14:02:29.000000000 -0500
-@@ -115,8 +115,16 @@ extern u32 ieee80211_debug_level;
- do { if (ieee80211_debug_level & (level)) \
- printk(KERN_DEBUG "ieee80211: %c %s " fmt, \
- in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)
-+static inline bool ieee80211_ratelimit_debug(u32 level)
-+{
-+ return (ieee80211_debug_level & level) && net_ratelimit();
-+}
- #else
- #define IEEE80211_DEBUG(level, fmt, args...) do {} while (0)
-+static inline bool ieee80211_ratelimit_debug(u32 level)
-+{
-+ return false;
-+}
- #endif /* CONFIG_IEEE80211_DEBUG */
+- return count;
++ return error ? error : count;
+ }
- /* escape_essid() is intended to be used in debug (and possibly error)
+ static ssize_t rfkill_claim_show(struct device *dev,
--- linux-2.6-iwlwifi-cve-2007-5938.patch DELETED ---
More information about the fedora-extras-commits
mailing list