rpms/kernel/F-8 kernel.spec, 1.265, 1.266 linux-2.6-wireless-pending.patch, 1.13, 1.14
John W. Linville (linville)
fedora-extras-commits at redhat.com
Fri Nov 16 14:34:21 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23517
Modified Files:
kernel.spec linux-2.6-wireless-pending.patch
Log Message:
fix busted ssb bits
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- kernel.spec 16 Nov 2007 04:00:40 -0000 1.265
+++ kernel.spec 16 Nov 2007 14:33:46 -0000 1.266
@@ -1282,11 +1282,11 @@
# wireless patches staged for 2.6.25
ApplyPatch linux-2.6-wireless-pending.patch
# Add misc wireless bits from upstream wireless tree
-ApplyPatch linux-2.6-at76.patch
-ApplyPatch linux-2.6-ath5k.patch
-ApplyPatch linux-2.6-zd1211rw-mac80211.patch
-ApplyPatch linux-2.6-rtl8180.patch
-ApplyPatch linux-2.6-b43-rev-d.patch
+#ApplyPatch linux-2.6-at76.patch
+#ApplyPatch linux-2.6-ath5k.patch
+#ApplyPatch linux-2.6-zd1211rw-mac80211.patch
+#ApplyPatch linux-2.6-rtl8180.patch
+#ApplyPatch linux-2.6-b43-rev-d.patch
# latest Intel driver for ich9
ApplyPatch linux-2.6-netdev-e1000e-01.patch
linux-2.6-wireless-pending.patch:
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/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 16 Nov 2007 04:00:40 -0000 1.13
+++ linux-2.6-wireless-pending.patch 16 Nov 2007 14:33:46 -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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2007-11-16 09:25:18.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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pci.c 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/pci.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pci.c 2007-11-16 09:25:41.000000000 -0500
@@ -212,29 +212,29 @@ static inline u8 ssb_crc8(u8 crc, u8 dat
return t[crc ^ data];
}
@@ -275,7 +275,7 @@
- sprom_extract_r3(&out->r3, in);
- if (out->revision >= 4)
+ if (out->revision >= 1 && out->revision <= 3) {
-+ sprom_extract_r123(out, in, out->revision);
++ sprom_extract_r123(out, in);
+ }
+ if (out->revision == 4)
+ sprom_extract_r4(out, in);
@@ -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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/main.c 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/main.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/main.c 2007-11-16 09:25:18.000000000 -0500
@@ -877,14 +877,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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/b44.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/b44.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/b44.c 2007-11-16 09:25:18.000000000 -0500
@@ -2066,11 +2066,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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/atmel.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/atmel.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/atmel.c 2007-11-16 09:25:18.000000000 -0500
@@ -1761,7 +1761,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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/p54pci.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/p54pci.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/p54pci.c 2007-11-16 09:25:18.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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h 2007-11-16 09:25:18.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-12 23:12:46.917997680 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/wa.h 2007-11-15 22:19:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/wa.h 2007-11-16 09:25:18.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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile 2007-11-16 09:25:18.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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/main.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.c 2007-11-16 09:25:18.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43 wireless driver
@@ -1132,7 +1132,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-12 23:12:46.917997680 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/wa.c 2007-11-15 22:19:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/wa.c 2007-11-16 09:25:18.000000000 -0500
@@ -0,0 +1,665 @@
+/*
+
@@ -1800,8 +1800,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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/main.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.h 2007-11-16 09:25:18.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43 wireless driver
@@ -1812,8 +1812,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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c 2007-11-16 09:25:18.000000000 -0500
@@ -5,7 +5,7 @@
Transmission (TX/RX) related functions.
@@ -1850,8 +1850,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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c 2007-11-16 09:25:18.000000000 -0500
@@ -352,7 +352,7 @@ static ssize_t b43_debugfs_read(struct f
struct b43_wldev *dev;
struct b43_debugfs_fops *dfops;
@@ -1862,8 +1862,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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c 2007-11-16 09:25:18.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43 wireless driver
@@ -2718,8 +2718,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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h 2007-11-16 09:25:18.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 */
@@ -2779,8 +2779,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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/leds.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/leds.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/leds.c 2007-11-16 09:25:18.000000000 -0500
@@ -4,7 +4,7 @@
LED control
@@ -2806,8 +2806,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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/tables.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/tables.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/tables.h 2007-11-16 09:25:18.000000000 -0500
@@ -1,9 +1,9 @@
#ifndef B43_TABLES_H_
#define B43_TABLES_H_
@@ -2841,8 +2841,8 @@
#endif /* B43_TABLES_H_ */
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/lo.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/lo.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/lo.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/lo.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/lo.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/lo.c 2007-11-16 09:25:18.000000000 -0500
@@ -5,7 +5,7 @@
G PHY LO (LocalOscillator) Measuring and Control routines
@@ -2873,8 +2873,8 @@
} else {
b43_phy_write(dev, B43_PHY_RFOVER, 0x133);
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/tables.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/tables.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/tables.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/tables.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/tables.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/tables.c 2007-11-16 09:25:18.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43 wireless driver
@@ -3053,7 +3053,7 @@
u16 b43_gtab_read(struct b43_wldev *dev, u16 table, u16 offset)
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
--- /dev/null 2007-11-12 23:12:46.917997680 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h 2007-11-15 22:19:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h 2007-11-16 09:25:18.000000000 -0500
@@ -0,0 +1,1582 @@
+/******************************************************************************
+ *
@@ -4638,8 +4638,8 @@
+
+#endif /* __iwl4965_commands_h__ */
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2007-11-15 22:32:57.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2007-11-16 09:25:18.000000000 -0500
@@ -37,12 +37,11 @@
#include <net/mac80211.h>
#include <linux/etherdevice.h>
@@ -7187,8 +7187,8 @@
-MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
+MODULE_DEVICE_TABLE(pci, iwl4965_hw_card_ids);
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h 2007-11-16 09:25:18.000000000 -0500
@@ -8,7 +8,7 @@
* Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
*
@@ -8000,8 +8000,8 @@
-#endif /* __iwl_4965_hw_h__ */
+#endif /* __iwl4965_4965_hw_h__ */
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig 2007-11-16 09:25:18.000000000 -0500
@@ -1,24 +1,65 @@
-config IWLWIFI
- bool "Intel Wireless WiFi Link Drivers"
@@ -8208,8 +8208,8 @@
- say M here and read <file:Documentation/modules.txt>. The module
- will be called iwl3945.ko.
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-prph.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-prph.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-prph.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-prph.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-prph.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-prph.h 2007-11-16 09:25:18.000000000 -0500
@@ -8,7 +8,7 @@
* Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
*
@@ -8277,8 +8277,8 @@
#endif /* __iwl_prph_h__ */
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h 2007-11-16 09:25:18.000000000 -0500
@@ -8,7 +8,7 @@
* Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
*
@@ -8975,8 +8975,8 @@
return cpu_to_le16((u16)rate|flags);
}
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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2007-11-15 22:31:14.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2007-11-16 09:25:18.000000000 -0500
@@ -56,16 +56,16 @@
#include <asm/div64.h>
@@ -15588,7 +15588,7 @@
+module_init(iwl3945_init);
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-debug.h
--- /dev/null 2007-11-12 23:12:46.917997680 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-debug.h 2007-11-15 22:19:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-debug.h 2007-11-16 09:25:18.000000000 -0500
@@ -0,0 +1,152 @@
+/******************************************************************************
+ *
@@ -15743,8 +15743,8 @@
+
+#endif
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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2007-11-15 22:32:18.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2007-11-16 09:25:18.000000000 -0500
@@ -56,16 +56,16 @@
#include <asm/div64.h>
@@ -22846,7 +22846,7 @@
+module_init(iwl4965_init);
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h
--- /dev/null 2007-11-12 23:12:46.917997680 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h 2007-11-15 22:19:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h 2007-11-16 09:25:18.000000000 -0500
@@ -0,0 +1,1467 @@
+/******************************************************************************
+ *
@@ -24316,8 +24316,8 @@
+
+#endif /* __iwl3945_3945_commands_h__ */
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h 2007-11-16 09:25:18.000000000 -0500
@@ -29,7 +29,7 @@
#include "iwl-4965.h"
@@ -24415,8 +24415,8 @@
#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2007-11-15 22:31:50.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2007-11-16 09:25:18.000000000 -0500
@@ -39,11 +39,8 @@
#include <linux/etherdevice.h>
@@ -25998,7 +25998,7 @@
+MODULE_DEVICE_TABLE(pci, iwl3945_hw_card_ids);
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h
--- /dev/null 2007-11-12 23:12:46.917997680 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h 2007-11-15 22:19:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h 2007-11-16 09:25:18.000000000 -0500
@@ -0,0 +1,431 @@
+/******************************************************************************
+ *
@@ -26433,7 +26433,7 @@
+#endif
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h
--- /dev/null 2007-11-12 23:12:46.917997680 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h 2007-11-15 22:19:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h 2007-11-16 09:25:18.000000000 -0500
@@ -0,0 +1,431 @@
+/******************************************************************************
+ *
@@ -26867,8 +26867,8 @@
+}
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h 2007-11-16 09:25:18.000000000 -0500
@@ -27,15 +27,974 @@
#ifndef __iwl_3945_h__
#define __iwl_3945_h__
@@ -27852,8 +27852,8 @@
+
#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h 2007-11-16 09:25:18.000000000 -0500
@@ -27,7 +27,7 @@
#ifndef __iwl_3945_rs_h__
#define __iwl_3945_rs_h__
@@ -27931,8 +27931,8 @@
#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c 2007-11-15 22:25:41.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c 2007-11-16 09:25:18.000000000 -0500
@@ -37,15 +37,13 @@
#include <linux/workqueue.h>
@@ -28453,8 +28453,8 @@
ieee80211_rate_control_unregister(&rs_ops);
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c 2007-11-15 22:24:01.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c 2007-11-16 09:25:18.000000000 -0500
@@ -36,11 +36,9 @@
#include <linux/workqueue.h>
@@ -29636,8 +29636,8 @@
ieee80211_rate_control_unregister(&rs_ops);
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h 2007-11-16 09:25:18.000000000 -0500
@@ -26,61 +26,760 @@
#ifndef __iwl_4965_h__
#define __iwl_4965_h__
@@ -30840,7 +30840,7 @@
+#endif /* __iwl4965_4965_h__ */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-debug.h
--- /dev/null 2007-11-12 23:12:46.917997680 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-debug.h 2007-11-15 22:19:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-debug.h 2007-11-16 09:25:18.000000000 -0500
@@ -0,0 +1,152 @@
+/******************************************************************************
+ *
@@ -30995,8 +30995,8 @@
+
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig linux-2.6.23.noarch/drivers/net/wireless/Makefile
---- linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/Makefile 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/Makefile 2007-11-16 09:25:18.000000000 -0500
@@ -52,7 +52,8 @@ obj-$(CONFIG_RTL8187) += rtl8187.o
obj-$(CONFIG_ADM8211) += adm8211.o
@@ -31008,8 +31008,8 @@
obj-$(CONFIG_RT2X00) += rt2x00/
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2007-11-16 09:25:18.000000000 -0500
@@ -52,7 +52,7 @@
* the access attempt is considered to have failed,
* and we will print an error.
@@ -31675,8 +31675,8 @@
TXD_DESC_SIZE),
skb->len - TXD_DESC_SIZE, control);
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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2007-11-16 09:25:18.000000000 -0500
@@ -52,8 +52,9 @@
* between each attampt. When the busy bit is still set at that time,
* the access attempt is considered to have failed,
@@ -32168,8 +32168,8 @@
TXD_DESC_SIZE),
skb->len - TXD_DESC_SIZE, control);
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.h 2007-11-16 09:25:18.000000000 -0500
@@ -713,13 +713,19 @@ struct hw_pairwise_ta_entry {
* R4: RX antenna control
* FRAME_END: 1 - DPDT, 0 - SPDT (Only valid for 802.11G, RF2527 & RF2529)
@@ -32204,8 +32204,8 @@
/*
* TX descriptor format for TX, PRIO and Beacon Ring.
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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2007-11-16 09:25:18.000000000 -0500
@@ -31,6 +31,7 @@
#include <linux/skbuff.h>
#include <linux/workqueue.h>
@@ -32538,8 +32538,8 @@
unsigned int length,
struct ieee80211_tx_control *control);
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00config.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00config.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00config.c 2007-11-16 09:25:18.000000000 -0500
@@ -94,12 +94,44 @@ void rt2x00lib_config_type(struct rt2x00
rt2x00dev->ops->lib->config_type(rt2x00dev, type, tsf_sync);
}
@@ -32671,8 +32671,8 @@
+ }
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2007-11-16 09:25:18.000000000 -0500
@@ -67,7 +67,21 @@ EXPORT_SYMBOL_GPL(rt2x00lib_get_ring);
*/
static void rt2x00lib_start_link_tuner(struct rt2x00_dev *rt2x00dev)
@@ -32968,8 +32968,8 @@
tx_rate = control->rts_cts_rate;
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h 2007-11-16 09:25:18.000000000 -0500
@@ -430,10 +430,21 @@
/*
@@ -33005,8 +33005,8 @@
/*
* TX descriptor format for TX, PRIO, ATIM and Beacon Ring.
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2007-11-16 09:25:18.000000000 -0500
@@ -68,8 +68,10 @@ static void rt2x00rfkill_poll(struct inp
struct rt2x00_dev *rt2x00dev = poll_dev->private;
int state = rt2x00dev->ops->lib->rfkill_poll(rt2x00dev);
@@ -33097,8 +33097,8 @@
rfkill_free(rt2x00dev->rfkill);
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h 2007-11-16 09:25:18.000000000 -0500
@@ -53,6 +53,8 @@ void rt2x00lib_uninitialize(struct rt2x0
void rt2x00lib_config_mac_addr(struct rt2x00_dev *rt2x00dev, u8 *mac);
void rt2x00lib_config_bssid(struct rt2x00_dev *rt2x00dev, u8 *bssid);
@@ -33109,8 +33109,8 @@
struct ieee80211_conf *conf, const int force_config);
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.h 2007-11-16 09:25:18.000000000 -0500
@@ -1077,13 +1077,19 @@ struct hw_pairwise_ta_entry {
* R4: RX antenna control
* FRAME_END: 1 - DPDT, 0 - SPDT (Only valid for 802.11G, RF2527 & RF2529)
@@ -33145,8 +33145,8 @@
/*
* TX descriptor format for TX, PRIO and Beacon Ring.
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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c 2007-11-16 09:25:18.000000000 -0500
@@ -31,6 +31,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -33245,8 +33245,8 @@
rt2x00dev->usb_maxpacket =
usb_maxpacket(usb_dev, usb_sndbulkpipe(usb_dev, 1), 1);
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2007-11-16 09:25:18.000000000 -0500
@@ -54,7 +54,7 @@
* the access attempt is considered to have failed,
* and we will print an error.
@@ -33563,8 +33563,8 @@
/*
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.h 2007-11-16 09:25:18.000000000 -0500
@@ -803,8 +803,8 @@
/*
* DMA descriptor defines.
@@ -33577,8 +33577,8 @@
/*
* TX descriptor format for TX, PRIO, ATIM and Beacon Ring.
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h 2007-11-16 09:25:18.000000000 -0500
@@ -57,7 +57,7 @@
/*
* Register access.
@@ -33628,8 +33628,8 @@
/*
* Device initialization handlers.
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h 2007-11-16 09:25:18.000000000 -0500
@@ -30,9 +30,9 @@ struct rt2x00_dev;
#define RT2X00DEBUGFS_REGISTER_ENTRY(__name, __type) \
@@ -33643,8 +33643,8 @@
\
unsigned int word_size; \
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h 2007-11-16 09:25:18.000000000 -0500
@@ -27,20 +27,6 @@
#define RT2X00RING_H
@@ -33696,8 +33696,8 @@
#endif /* RT2X00RING_H */
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h 2007-11-16 09:25:18.000000000 -0500
@@ -91,7 +91,7 @@
* a buffer allocated by kmalloc. Failure to do so can lead
* to unexpected behavior depending on the architecture.
@@ -33748,8 +33748,8 @@
int timeout = REGISTER_TIMEOUT * (lenght / sizeof(u16));
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2007-11-16 09:25:18.000000000 -0500
@@ -54,7 +54,7 @@
* the access attempt is considered to have failed,
* and we will print an error.
@@ -34058,8 +34058,8 @@
*/
rt2x00dev->led_mode =
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h 2007-11-16 09:25:18.000000000 -0500
@@ -1082,8 +1082,8 @@
/*
* DMA descriptor defines.
@@ -34072,8 +34072,8 @@
/*
* TX descriptor format for TX, PRIO, ATIM and Beacon Ring.
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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2007-11-16 09:25:18.000000000 -0500
@@ -52,8 +52,10 @@
* between each attampt. When the busy bit is still set at that time,
* the access attempt is considered to have failed,
@@ -34502,8 +34502,8 @@
ring->desc_size),
skb->len - ring->desc_size, control);
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2007-11-16 09:25:18.000000000 -0500
@@ -80,7 +80,7 @@ int rt2x00pci_write_tx_data(struct rt2x0
{
struct ieee80211_hdr *ieee80211hdr = (struct ieee80211_hdr *)skb->data;
@@ -34570,8 +34570,8 @@
* Device initialization handlers.
*/
diff -up linux-2.6.23.noarch/drivers/net/wireless/p54common.c.orig linux-2.6.23.noarch/drivers/net/wireless/p54common.c
---- linux-2.6.23.noarch/drivers/net/wireless/p54common.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/p54common.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/p54common.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/p54common.c 2007-11-16 09:25:18.000000000 -0500
@@ -374,7 +374,7 @@ static void p54_rx_frame_sent(struct iee
if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0)
pad = entry_data->align[0];
@@ -34582,8 +34582,8 @@
status.flags |= IEEE80211_TX_STATUS_ACK;
else
diff -up linux-2.6.23.noarch/drivers/net/wireless/orinoco.h.orig linux-2.6.23.noarch/drivers/net/wireless/orinoco.h
---- linux-2.6.23.noarch/drivers/net/wireless/orinoco.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/orinoco.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/orinoco.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/orinoco.h 2007-11-16 09:25:18.000000000 -0500
@@ -36,6 +36,12 @@ typedef enum {
FIRMWARE_TYPE_SYMBOL
} fwtype_t;
@@ -34613,8 +34613,8 @@
#ifdef ORINOCO_DEBUG
diff -up linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c.orig linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
---- linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c 2007-11-16 09:25:18.000000000 -0500
@@ -403,7 +403,7 @@ static int uw2453_init_hw(struct zd_rf *
if (r)
return r;
@@ -34625,8 +34625,8 @@
"PLL locked on configuration %d\n", i);
found_config = i;
diff -up linux-2.6.23.noarch/drivers/net/wireless/airo.c.orig linux-2.6.23.noarch/drivers/net/wireless/airo.c
---- linux-2.6.23.noarch/drivers/net/wireless/airo.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/airo.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/airo.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/airo.c 2007-11-16 09:25:18.000000000 -0500
@@ -6417,7 +6417,7 @@ static int airo_set_encode(struct net_de
set_wep_key(local, index, NULL, 0, perm, 1);
} else
@@ -34637,8 +34637,8 @@
}
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/scan.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/scan.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/scan.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/scan.c 2007-11-15 22:35:22.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/scan.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/scan.c 2007-11-16 09:25:18.000000000 -0500
@@ -39,8 +39,8 @@
//! Memory needed to store a max number/size SSID TLV for a firmware scan
#define SSID_TLV_MAX_SIZE (1 * sizeof(struct mrvlietypes_ssidparamset))
@@ -35264,8 +35264,8 @@
lbs_deb_scan("SCAN_RESP: process_bss returned ERROR\n");
continue;
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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/if_cs.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/if_cs.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/if_cs.c 2007-11-16 09:25:18.000000000 -0500
@@ -57,7 +57,7 @@ MODULE_LICENSE("GPL");
struct if_cs_card {
@@ -35444,8 +35444,8 @@
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/hostcmd.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/hostcmd.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/hostcmd.h.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/hostcmd.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/hostcmd.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/hostcmd.h 2007-11-16 09:25:18.000000000 -0500
@@ -2,8 +2,8 @@
* This file contains the function prototypes, data structure
* and defines for all the host/station commands
@@ -35476,8 +35476,8 @@
u32 value;
};
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/decl.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/decl.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/decl.h.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/decl.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/decl.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/decl.h 2007-11-16 09:25:18.000000000 -0500
@@ -3,80 +3,80 @@
* functions defined in other source files
*/
@@ -35601,8 +35601,8 @@
-#endif /* _WLAN_DECL_H_ */
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/debugfs.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/debugfs.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/debugfs.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/debugfs.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/debugfs.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/debugfs.h 2007-11-16 09:25:18.000000000 -0500
@@ -1,6 +1,10 @@
-void libertas_debugfs_init(void);
-void libertas_debugfs_remove(void);
@@ -35619,8 +35619,8 @@
+
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/join.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/join.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/join.h.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/join.h 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/join.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/join.h 2007-11-16 09:25:18.000000000 -0500
@@ -2,52 +2,52 @@
* Interface for the wlan infrastructure and adhoc join routines
*
@@ -35694,8 +35694,8 @@
#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.h.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.h 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.h 2007-11-16 09:25:18.000000000 -0500
@@ -1,5 +1,5 @@
-#ifndef _LIBERTAS_IF_USB_H
-#define _LIBERTAS_IF_USB_H
@@ -35705,8 +35705,8 @@
#include <linux/list.h>
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/join.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/join.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/join.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/join.c 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/join.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/join.c 2007-11-16 09:25:18.000000000 -0500
@@ -30,16 +30,16 @@
* NOTE: Setting the MSB of the basic rates need to be taken
* care, either before or after calling this function
@@ -36145,8 +36145,8 @@
lbs_deb_leave(LBS_DEB_JOIN);
return 0;
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/types.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/types.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/types.h.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/types.h 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/types.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/types.h 2007-11-16 09:25:18.000000000 -0500
@@ -1,8 +1,8 @@
/**
* This header file contains definition for global types
@@ -36165,8 +36165,8 @@
-#endif /* _WLAN_TYPES_ */
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/ethtool.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/ethtool.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/ethtool.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/ethtool.c 2007-11-15 22:28:03.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/ethtool.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/ethtool.c 2007-11-16 09:25:18.000000000 -0500
@@ -19,35 +19,35 @@ static const char * mesh_stat_strings[]=
"tx_failed_cnt"
};
@@ -36304,8 +36304,8 @@
};
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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c 2007-11-16 09:25:18.000000000 -0500
@@ -24,7 +24,7 @@
#include "join.h"
@@ -37658,8 +37658,8 @@
MODULE_DESCRIPTION("Libertas WLAN Driver Library");
MODULE_AUTHOR("Marvell International Ltd.");
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/scan.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/scan.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/scan.h.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/scan.h 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/scan.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/scan.h 2007-11-16 09:25:18.000000000 -0500
@@ -2,10 +2,10 @@
* Interface for the wlan network scan routines
*
@@ -37842,8 +37842,8 @@
-#endif /* _WLAN_SCAN_H */
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/defs.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/defs.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/defs.h.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/defs.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/defs.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/defs.h 2007-11-16 09:25:18.000000000 -0500
@@ -2,8 +2,8 @@
* This header file contains global constant/enum definitions,
* global variable declaration.
@@ -37959,8 +37959,8 @@
-#endif /* _WLAN_DEFS_H_ */
+#endif
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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c 2007-11-15 22:27:08.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c 2007-11-16 09:25:18.000000000 -0500
@@ -21,15 +21,33 @@
#include "assoc.h"
@@ -39220,8 +39220,8 @@
+ .get_wireless_stats = lbs_get_wireless_stats,
};
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.h 2007-11-16 09:25:18.000000000 -0500
@@ -1,32 +1,14 @@
/* Copyright (C) 2006, Red Hat, Inc. */
@@ -39262,8 +39262,8 @@
-#endif /* _WLAN_ASSOC_H */
+#endif /* _LBS_ASSOC_H */
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/host.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/host.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/host.h.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/host.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/host.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/host.h 2007-11-16 09:25:18.000000000 -0500
@@ -2,8 +2,8 @@
* This file contains definitions of WLAN commands.
*/
@@ -39282,8 +39282,8 @@
-#endif /* _HOST_H_ */
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/cmd.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/cmd.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/cmd.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/cmd.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/cmd.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/cmd.c 2007-11-16 09:25:18.000000000 -0500
@@ -37,7 +37,7 @@ static u8 is_command_allowed_in_ps(__le1
return 0;
}
@@ -40249,8 +40249,8 @@
} else {
lbs_deb_host("sleep confirm has been delayed\n");
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/debugfs.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/debugfs.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/debugfs.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/debugfs.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/debugfs.c 2007-11-16 09:25:18.000000000 -0500
@@ -11,14 +11,14 @@
#include "host.h"
#include "debugfs.h"
@@ -41367,8 +41367,8 @@
#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/tx.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/tx.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/tx.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/tx.c 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/tx.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/tx.c 2007-11-16 09:25:18.000000000 -0500
@@ -52,11 +52,11 @@ static u32 convert_radiotap_rate_to_mv(u
* @brief This function processes a single packet and sends
* to IF layer
@@ -41499,8 +41499,8 @@
-EXPORT_SYMBOL_GPL(libertas_send_tx_feedback);
+EXPORT_SYMBOL_GPL(lbs_send_tx_feedback);
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/dev.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/dev.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/dev.h.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/dev.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/dev.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/dev.h 2007-11-16 09:25:18.000000000 -0500
@@ -1,10 +1,10 @@
/**
* This file contains definitions and data structures specific
@@ -41659,8 +41659,8 @@
-#endif /* _WLAN_DEV_H_ */
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/cmdresp.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/cmdresp.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/cmdresp.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/cmdresp.c 2007-11-16 09:25:18.000000000 -0500
@@ -20,15 +20,15 @@
* reports disconnect to upper layer, clean tx/rx packets,
* reset link state etc.
@@ -42241,8 +42241,8 @@
netif_wake_queue(priv->mesh_dev);
netif_carrier_on(priv->mesh_dev);
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.c 2007-11-15 22:36:12.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.c 2007-11-16 09:25:18.000000000 -0500
@@ -14,33 +14,11 @@
static const u8 bssid_any[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
static const u8 bssid_off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
@@ -42875,8 +42875,8 @@
return assoc_req;
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.h.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.h 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.h 2007-11-16 09:25:18.000000000 -0500
@@ -1,11 +1,11 @@
/**
* This file contains definition for IOCTL call.
@@ -42907,8 +42907,8 @@
-#endif /* _WLAN_WEXT_H_ */
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.c 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.c 2007-11-16 09:25:18.000000000 -0500
@@ -21,8 +21,8 @@
static const char usbdriver_name[] = "usb8xxx";
static u8 *default_fw_name = "usb8388.bin";
@@ -43232,8 +43232,8 @@
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/rx.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/rx.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/rx.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/rx.c 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/rx.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/rx.c 2007-11-16 09:25:18.000000000 -0500
@@ -35,19 +35,19 @@ struct rx80211packethdr {
void *eth80211_hdr;
} __attribute__ ((packed));
@@ -43437,8 +43437,8 @@
ret = 0;
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/11d.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/11d.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/11d.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/11d.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/11d.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/11d.c 2007-11-16 09:25:18.000000000 -0500
@@ -43,7 +43,7 @@ static struct chan_freq_power channel_fr
{14, 2484, TX_PWR_DEFAULT}
};
@@ -43719,8 +43719,8 @@
&adapter->domainreg);
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/11d.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/11d.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/11d.h.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/11d.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/11d.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/11d.h 2007-11-16 09:25:18.000000000 -0500
@@ -2,8 +2,8 @@
* This header file contains data structures and
* function declarations of 802.11d
@@ -43778,8 +43778,8 @@
-#endif /* _WLAN_11D_ */
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_mgt.c.orig linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_mgt.c
---- linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_mgt.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_mgt.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_mgt.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_mgt.c 2007-11-16 09:25:18.000000000 -0500
@@ -460,7 +460,7 @@ islpci_mgt_transaction(struct net_device
*recvframe = NULL;
@@ -43799,8 +43799,8 @@
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.h.orig linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.h
---- linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.h 2007-11-16 09:25:18.000000000 -0500
@@ -26,6 +26,7 @@
#include <linux/wireless.h>
#include <net/iw_handler.h>
@@ -43819,8 +43819,8 @@
wait_queue_head_t mgmt_wqueue; /* waitqueue for mbox */
diff -up linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.c.orig linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.c
---- linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.c 2007-11-16 09:25:18.000000000 -0500
@@ -862,7 +862,7 @@ islpci_setup(struct pci_dev *pdev)
init_waitqueue_head(&priv->reset_done);
@@ -43831,8 +43831,8 @@
init_waitqueue_head(&priv->mgmt_wqueue);
sema_init(&priv->stats_sem, 1);
diff -up linux-2.6.23.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.23.noarch/drivers/net/wireless/prism54/isl_ioctl.c
---- linux-2.6.23.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2007-11-16 09:25:18.000000000 -0500
@@ -1118,7 +1118,7 @@ prism54_set_encode(struct net_device *nd
mgt_set_request(priv, DOT11_OID_DEFKEYID, 0,
&index);
@@ -43852,8 +43852,8 @@
return -EINVAL;
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Kconfig.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Kconfig
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Kconfig.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Kconfig 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Kconfig.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Kconfig 2007-11-16 09:25:18.000000000 -0500
@@ -34,6 +34,22 @@ config B43LEGACY_PCICORE_AUTOSELECT
select SSB_DRIVER_PCICORE
default y
@@ -43878,8 +43878,8 @@
bool "Broadcom 43xx-legacy debugging"
depends on B43LEGACY
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2007-11-16 09:25:18.000000000 -0500
@@ -19,6 +19,7 @@
#include "debugfs.h"
@@ -43913,8 +43913,8 @@
/* Reason code of the last interrupt. */
u32 irq_reason;
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/ilt.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/ilt.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/ilt.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/ilt.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/ilt.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/ilt.c 2007-11-16 09:25:18.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43legacy wireless driver
@@ -43925,8 +43925,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/Makefile.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Makefile
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Makefile.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Makefile 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Makefile.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Makefile 2007-11-16 09:25:18.000000000 -0500
@@ -1,14 +1,19 @@
-obj-$(CONFIG_B43LEGACY) += b43legacy.o
-b43legacy-obj-$(CONFIG_B43LEGACY_DEBUG) += debugfs.o
@@ -43960,8 +43960,8 @@
- xmit.o \
- $(b43legacy-obj-y)
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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c 2007-11-16 09:25:18.000000000 -0500
@@ -3,7 +3,7 @@
* Broadcom B43legacy wireless driver
*
@@ -44664,8 +44664,8 @@
/* Get and initialize struct b43legacy_wl */
wl = hw_to_b43legacy_wl(hw);
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2007-11-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.c 2007-11-16 09:25:18.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43legacy wireless driver
@@ -44769,8 +44769,8 @@
void b43legacy_radio_clear_tssi(struct b43legacy_wldev *dev)
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.h.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.h 2007-11-16 09:25:18.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43legacy wireless driver
@@ -44781,8 +44781,8 @@
Copyright (c) 2005 Danny van Dyk <kugelfang at gentoo.org>
Copyright (c) 2005 Andreas Jaggi <andreas.jaggi at waterwave.ch>
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/xmit.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/xmit.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/xmit.c.orig 2007-11-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/xmit.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/xmit.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/xmit.c 2007-11-16 09:25:18.000000000 -0500
@@ -5,7 +5,7 @@
Transmission (TX/RX) related functions.
@@ -44819,8 +44819,8 @@
if (in_rssi > 63)
in_rssi = 63;
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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c 2007-11-16 09:25:18.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43legacy wireless driver
@@ -44961,8 +44961,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-15 22:18:11.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.h 2007-11-16 09:25:18.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43legacy wireless driver
@@ -44973,8 +44973,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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c 2007-11-16 09:25:18.000000000 -0500
@@ -1,13 +1,13 @@
/*
@@ -45441,8 +45441,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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h 2007-11-16 09:25:18.000000000 -0500
@@ -3,7 +3,7 @@
Broadcom B43legacy wireless driver
@@ -45463,7 +45463,7 @@
int synthetic_pu_workaround);
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.h
--- /dev/null 2007-11-12 23:12:46.917997680 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.h 2007-11-15 22:19:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.h 2007-11-16 09:25:18.000000000 -0500
@@ -0,0 +1,59 @@
+#ifndef B43legacy_RFKILL_H_
+#define B43legacy_RFKILL_H_
@@ -45525,8 +45525,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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h 2007-11-16 09:25:18.000000000 -0500
@@ -1,30 +1,33 @@
#ifndef B43legacy_LEDS_H_
#define B43legacy_LEDS_H_
@@ -45615,7 +45615,7 @@
#endif /* B43legacy_LEDS_H_ */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c
--- /dev/null 2007-11-12 23:12:46.917997680 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c 2007-11-15 22:19:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c 2007-11-16 09:25:18.000000000 -0500
@@ -0,0 +1,189 @@
+/*
+
@@ -45807,8 +45807,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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/orinoco.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/orinoco.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/orinoco.c 2007-11-16 09:25:18.000000000 -0500
@@ -270,6 +270,37 @@ static inline void set_port_type(struct
}
}
@@ -46460,8 +46460,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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c 2007-11-16 09:25:18.000000000 -0500
@@ -708,7 +708,7 @@ int ieee80211_wx_get_encodeext(struct ie
} else
idx = ieee->tx_keyidx;
@@ -46472,8 +46472,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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c 2007-11-16 09:25:18.000000000 -0500
@@ -633,22 +633,35 @@ static int ieee80211_ioctl_siwtxpower(st
{
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
@@ -46515,8 +46515,8 @@
ieee80211_hw_config(local);
/* The return value of hw_config is not of big interest here,
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-15 22:19:27.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ieee80211.h 2007-11-15 22:19:37.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ieee80211.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ieee80211.h 2007-11-16 09:25:18.000000000 -0500
@@ -81,18 +81,18 @@
@@ -46544,8 +46544,8 @@
#define IEEE80211_MAX_SSID_LEN 32
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-15 22:18:12.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2007-11-15 22:19:59.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2007-11-16 09:25:18.000000000 -0500
@@ -147,6 +147,10 @@
#define SSB_IDLOW_SSBREV 0xF0000000 /* Sonics Backplane Revision code */
#define SSB_IDLOW_SSBREV_22 0x00000000 /* <= 2.2 */
@@ -46646,9 +46646,9 @@
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-15 22:18:12.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2007-11-15 22:19:59.000000000 -0500
-@@ -15,22 +15,13 @@ struct pcmcia_device;
+--- linux-2.6.23.noarch/include/linux/ssb/ssb.h.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2007-11-16 09:25:41.000000000 -0500
+@@ -15,22 +15,14 @@ struct pcmcia_device;
struct ssb_bus;
struct ssb_driver;
@@ -46658,6 +46658,7 @@
- u16 pci_svid; /* Subsystem Vendor ID for PCI */
- u16 pci_pid; /* Product ID for PCI */
+struct ssb_sprom {
++ u8 revision;
u8 il0mac[6]; /* MAC address for 802.11b/g */
u8 et0mac[6]; /* MAC address for Ethernet */
u8 et1mac[6]; /* MAC address for 802.11a */
@@ -46675,7 +46676,7 @@
u16 pa0b0;
u16 pa0b1;
u16 pa0b2;
-@@ -41,61 +32,15 @@ struct ssb_sprom_r1 {
+@@ -41,61 +33,15 @@ struct ssb_sprom_r1 {
u8 gpio1; /* GPIO pin 1 */
u8 gpio2; /* GPIO pin 2 */
u8 gpio3; /* GPIO pin 3 */
@@ -46740,7 +46741,7 @@
};
/* Information about the PCB the circuitry is soldered on. */
-@@ -288,6 +233,7 @@ struct ssb_bus {
+@@ -288,6 +234,7 @@ struct ssb_bus {
/* ID information about the Chip. */
u16 chip_id;
u16 chip_rev;
@@ -46749,8 +46750,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-15 22:18:12.000000000 -0500
-+++ linux-2.6.23.noarch/MAINTAINERS 2007-11-15 22:19:56.000000000 -0500
+--- linux-2.6.23.noarch/MAINTAINERS.orig 2007-11-16 09:25:12.000000000 -0500
++++ linux-2.6.23.noarch/MAINTAINERS 2007-11-16 09:25:18.000000000 -0500
@@ -2063,10 +2063,12 @@ W: http://sourceforge.net/projects/e1000
S: Supported
More information about the fedora-extras-commits
mailing list