rpms/kernel/devel linux-2.6-mac80211-rate-limit-wep-bad-keyidx.patch, NONE, 1.1 linux-2.6-ssb-fix-auto-load.patch, NONE, 1.1 linux-2.6-wireless.patch, 1.4, 1.5 git-wireless-dev.patch, 1.30, 1.31 kernel.spec, 1.97, 1.98 linux-2.6-wireless-pending.patch, 1.1, 1.2 linux-2.6-mac80211-probe-hidden-essid.patch, 1.2, NONE
John W. Linville (linville)
fedora-extras-commits at redhat.com
Sat Aug 18 00:38:20 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8877
Modified Files:
git-wireless-dev.patch kernel.spec
linux-2.6-wireless-pending.patch
Added Files:
linux-2.6-mac80211-rate-limit-wep-bad-keyidx.patch
linux-2.6-ssb-fix-auto-load.patch linux-2.6-wireless.patch
Removed Files:
linux-2.6-mac80211-probe-hidden-essid.patch
Log Message:
wireless updates
linux-2.6-mac80211-rate-limit-wep-bad-keyidx.patch:
--- NEW FILE linux-2.6-mac80211-rate-limit-wep-bad-keyidx.patch ---
[PATCH] mac80211: rate limit WEP bad keyidx message
Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
net/mac80211/rx.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 0a10720..d74b6cb 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -343,13 +343,15 @@ ieee80211_rx_h_load_key(struct ieee80211_txrx_data *rx)
if (!rx->key) {
if (!rx->u.rx.ra_match)
return TXRX_DROP;
- printk(KERN_DEBUG "%s: RX WEP frame with "
- "unknown keyidx %d (A1=" MAC_FMT " A2="
- MAC_FMT " A3=" MAC_FMT ")\n",
- rx->dev->name, keyidx,
- MAC_ARG(hdr->addr1),
- MAC_ARG(hdr->addr2),
- MAC_ARG(hdr->addr3));
+ if (net_ratelimit())
+ printk(KERN_DEBUG "%s: RX WEP frame "
+ "with unknown keyidx %d "
+ "(A1=" MAC_FMT " A2=" MAC_FMT
+ " A3=" MAC_FMT ")\n",
+ rx->dev->name, keyidx,
+ MAC_ARG(hdr->addr1),
+ MAC_ARG(hdr->addr2),
+ MAC_ARG(hdr->addr3));
if (!rx->local->apdev)
return TXRX_DROP;
ieee80211_rx_mgmt(
--
John W. Linville
linville at tuxdriver.com
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
linux-2.6-ssb-fix-auto-load.patch:
--- NEW FILE linux-2.6-ssb-fix-auto-load.patch ---
>From linville at tuxdriver.com Fri Aug 17 18:45:11 2007
Return-Path: <linville at tuxdriver.com>
Received: from linville-t43.mobile (localhost.localdomain [127.0.0.1])
by linville-t43.mobile (8.14.1/8.13.8) with ESMTP id l7HMjBB4009877
for <linville at linville-t43.mobile>; Fri, 17 Aug 2007 18:45:11 -0400
Received: (from uucp at localhost)
by linville-t43.mobile (8.14.1/8.14.1/Submit) with UUCP id l7HMjBTN009873
for linville at linville-t43; Fri, 17 Aug 2007 18:45:11 -0400
Received: from ra.tuxdriver.com (ra.tuxdriver.com [127.0.0.1])
by ra.tuxdriver.com (8.14.0/8.13.7) with ESMTP id l7HMcDaf018765
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
for <linville%linville-t43 at tuxdriver.com>; Fri, 17 Aug 2007 18:38:18 -0400
Received: (from linville at localhost)
by ra.tuxdriver.com (8.14.0/8.14.0/Submit) id l7HMcC6i018764
for linville%linville-t43 at tuxdriver.com; Fri, 17 Aug 2007 18:38:13 -0400
Received: from mail.berlios.de (bat.berlios.de [195.37.77.135])
by ra.tuxdriver.com (8.14.0/8.13.7) with ESMTP id l7HMbU8F018757
for <linville at tuxdriver.com>; Fri, 17 Aug 2007 18:37:56 -0400
Received: from bat.berlios.de (localhost [127.0.0.1])
by mail.berlios.de (Postfix) with ESMTP id B9870102EFF;
Sat, 18 Aug 2007 00:37:38 +0200 (CEST)
X-Original-To: Bcm43xx-dev at lists.berlios.de
Delivered-To: Bcm43xx-dev at lists.berlios.de
Received: from ms-smtp-03.rdc-kc.rr.com (ms-smtp-03.rdc-kc.rr.com
[24.94.166.129])
by mail.berlios.de (Postfix) with ESMTP id 77093F60BB
for <Bcm43xx-dev at lists.berlios.de>;
Sat, 18 Aug 2007 00:37:30 +0200 (CEST)
Received: from larrylap (CPE-72-129-172-65.kc.res.rr.com [72.129.172.65])
by ms-smtp-03.rdc-kc.rr.com (8.13.6/8.13.6) with SMTP id l7HMWlnb029268;
Fri, 17 Aug 2007 17:32:47 -0500 (CDT)
Date: Fri, 17 Aug 2007 17:37:03 -0500
From: Larry Finger <Larry.Finger at lwfinger.net>
To: Michael Buesch <mb at bu3sch.de>
Subject: [PATCH] ssb: Fix auto-load problem for devices with 802.11 core
rev >= 10
Message-ID: <46c6230f.xC8MDU6Co5FWANra%Larry.Finger at lwfinger.net>
User-Agent: Heirloom mailx 12.1 6/15/06
MIME-Version: 1.0
X-Virus-Scanned: Symantec AntiVirus Scan Engine
Cc: Bcm43xx-dev at lists.berlios.de
X-BeenThere: bcm43xx-dev at lists.berlios.de
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: <bcm43xx-dev.lists.berlios.de>
List-Unsubscribe: <https://lists.berlios.de/mailman/listinfo/bcm43xx-dev>,
<mailto:bcm43xx-dev-request at lists.berlios.de?subject=unsubscribe>
List-Archive: <https://lists.berlios.de/pipermail/bcm43xx-dev>
List-Post: <mailto:bcm43xx-dev at lists.berlios.de>
List-Help: <mailto:bcm43xx-dev-request at lists.berlios.de?subject=help>
List-Subscribe: <https://lists.berlios.de/mailman/listinfo/bcm43xx-dev>,
<mailto:bcm43xx-dev-request at lists.berlios.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: bcm43xx-dev-bounces at lists.berlios.de
Errors-To: bcm43xx-dev-bounces at lists.berlios.de
X-Spam-Status: No, score=-2.5 required=3.0 tests=AWL,BAYES_00,SPF_HELO_PASS,
SPF_PASS autolearn=ham version=3.1.8-gr1
X-Spam-Checker-Version: SpamAssassin 3.1.8-gr1 (2007-02-13) on ra.tuxdriver.com
Status: RO
Content-Length: 1083
Lines: 35
From: Johannes Berg <johannes at sipsolutions.net>
The auto-loading mechanism from ssb to b43 is case sensitive; however, the
present code is generating a lower-case "a" for the BCM4311, which has an
802.11 core with revision 10.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
---
Michael,
Here is the "formal" patch for this buglet.
Larry
Index: wireless-dev/drivers/ssb/main.c
===================================================================
--- wireless-dev.orig/drivers/ssb/main.c
+++ wireless-dev/drivers/ssb/main.c
@@ -331,7 +331,7 @@ static int ssb_device_uevent(struct devi
ret = add_uevent_var(envp, num_envp, &i,
buffer, buffer_size, &length,
- "MODALIAS=ssb:v%.4xid%.4xrev%.2x",
+ "MODALIAS=ssb:v%.4xid%.4xrev%.2X",
ssb_dev->id.vendor, ssb_dev->id.coreid,
ssb_dev->id.revision);
envp[i] = NULL;
_______________________________________________
Bcm43xx-dev mailing list
Bcm43xx-dev at lists.berlios.de
https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
linux-2.6-wireless.patch:
Index: linux-2.6-wireless.patch
===================================================================
RCS file: linux-2.6-wireless.patch
diff -N linux-2.6-wireless.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ linux-2.6-wireless.patch 18 Aug 2007 00:38:16 -0000 1.5
@@ -0,0 +1,25 @@
+--- linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig 2007-08-17 17:45:52.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211.c 2007-08-17 19:23:06.000000000 -0400
+@@ -4678,7 +4678,6 @@ void ieee80211_tx_status(struct ieee8021
+ memset(skb->cb, 0, sizeof(skb->cb));
+ netif_rx(skb);
+ skb = skb2;
+- break;
+ }
+ }
+ out:
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig 2007-08-17 17:45:52.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c 2007-08-17 19:23:06.000000000 -0400
+@@ -2154,7 +2154,11 @@ static int ieee80211_sta_config_auth(str
+ return 0;
+ } else {
+ if (ifsta->state != IEEE80211_AUTHENTICATE) {
+- ieee80211_sta_start_scan(dev, NULL, 0);
++ if (ifsta->auto_ssid_sel)
++ ieee80211_sta_start_scan(dev, NULL, 0);
++ else
++ ieee80211_sta_start_scan(dev, ifsta->ssid,
++ ifsta->ssid_len);
+ ifsta->state = IEEE80211_AUTHENTICATE;
+ set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
+ } else
git-wireless-dev.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.30 -r 1.31 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- git-wireless-dev.patch 14 Aug 2007 15:59:19 -0000 1.30
+++ git-wireless-dev.patch 18 Aug 2007 00:38:15 -0000 1.31
@@ -1,390 +1,5 @@
-diff -u linux-2.6.22.noarch/drivers/net/wireless/Makefile linux-2.6.22.noarch/drivers/net/wireless/Makefile
---- linux-2.6.22.noarch/drivers/net/wireless/Makefile 2007-08-08 16:01:07.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Makefile 2007-08-14 11:32:28.000000000 -0400
-@@ -36,7 +36,9 @@
-
- obj-$(CONFIG_HOSTAP) += hostap/
- obj-$(CONFIG_BCM43XX) += bcm43xx/
-+obj-$(CONFIG_B43) += b43/
- obj-$(CONFIG_ZD1211RW) += zd1211rw/
-+obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw-mac80211/
-
- # 16-bit wireless PCMCIA client drivers
- obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
-@@ -49,0 +52,58 @@
-+
-+obj-$(CONFIG_ADM8211) += adm8211.o
-+
-+obj-$(CONFIG_P54_COMMON) += p54common.o
-+obj-$(CONFIG_P54_USB) += p54usb.o
-+obj-$(CONFIG_P54_PCI) += p54pci.o
-+
-+rt2x00lib-objs := rt2x00dev.o rt2x00mac.o rt2x00config.o
-+
-+ifeq ($(CONFIG_RT2X00_LIB_DEBUGFS),y)
-+ rt2x00lib-objs += rt2x00debug.o
-+endif
-+
-+ifeq ($(CONFIG_RT2X00_LIB_RFKILL),y)
-+ rt2x00lib-objs += rt2x00rfkill.o
-+endif
-+
-+ifeq ($(CONFIG_RT2X00_LIB_FIRMWARE),y)
-+ rt2x00lib-objs += rt2x00firmware.o
-+endif
-+
-+obj-$(CONFIG_RT2X00_LIB) += rt2x00lib.o
-+obj-$(CONFIG_RT2X00_LIB_PCI) += rt2x00pci.o
-+obj-$(CONFIG_RT2X00_LIB_USB) += rt2x00usb.o
-+obj-$(CONFIG_RT2400PCI) += rt2400pci.o
-+obj-$(CONFIG_RT2500PCI) += rt2500pci.o
-+obj-$(CONFIG_RT61PCI) += rt61pci.o
-+obj-$(CONFIG_RT2500USB) += rt2500usb.o
-+obj-$(CONFIG_RT73USB) += rt73usb.o
-+
-+# NOTE: We use common code from iwl-base.c to build driver
-+# specific binaries based on the #define IWL -- the target
-+# setup below creates a specific driver target from iwl-base.c
-+#
-+# NOTE2: iwl-base-XXXX.o has -D"KBUILD_MODNAME=KBUILD_STR(...)" in order to
-+# prevent the following kbuild error:
-+# include/linux/pci.h:603: error: `KBUILD_MODNAME' undeclared (first \
-+# use in this function)
-+#
-+# -jpk
-+
-+obj-$(CONFIG_IWL3945) += iwl3945.o
-+iwl3945-objs = iwl-base-3945.o iwl-3945.o iwl-3945-rs.o
-+CFLAGS_iwl-3945.o = -DIWL=3945
-+CFLAGS_iwl-3945-rs.o = -DIWL=3945
-+CFLAGS_iwl-base-3945.o = -DIWL=3945 -D"KBUILD_MODNAME=KBUILD_STR(iwl3945)"
-+$(obj)/iwl-base-3945.o: $(src)/iwl-base.c FORCE
-+ $(call cmd,force_checksrc)
-+ $(call if_changed_rule,cc_o_c)
-+
-+obj-$(CONFIG_IWL4965) += iwl4965.o
-+iwl4965-objs = iwl-base-4965.o iwl-4965.o iwl-4965-rs.o
-+CFLAGS_iwl-4965.o = -DIWL=4965
-+CFLAGS_iwl-4965-rs.o = -DIWL=4965
-+CFLAGS_iwl-base-4965.o = -DIWL=4965 -D"KBUILD_MODNAME=KBUILD_STR(iwl4965)"
-+$(obj)/iwl-base-4965.o: $(src)/iwl-base.c FORCE
-+ $(call cmd,force_checksrc)
-+ $(call if_changed_rule,cc_o_c)
-diff -u linux-2.6.22.noarch/drivers/net/wireless/Kconfig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-08-08 16:01:07.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-08-14 11:32:28.000000000 -0400
-@@ -551,7 +551,307 @@
- Thanks to Realtek for their support!
-
-+config ADM8211
-+ tristate "ADMtek ADM8211 support"
-+ depends on PCI && WLAN_80211 && MAC80211 && EXPERIMENTAL
-+ select CRC32
-+ ---help---
-+ This driver is for ADM8211A, ADM8211B, and ADM8211C based cards.
-+ These are PCI/mini-PCI/Cardbus 802.11b chips found in cards such as:
-+
-+ Xterasys Cardbus XN-2411b
-+ Blitz NetWave Point PC
-+ TrendNet 221pc
-+ Belkin F5D6001
-+ SMC 2635W
-+ Linksys WPC11 v1
-+ Fiberline FL-WL-200X
-+ 3com Office Connect (3CRSHPW796)
-+ Corega WLPCIB-11
-+ SMC 2602W V2 EU
-+ D-Link DWL-520 Revision C
-+
-+ However, some of these cards have been replaced with other chips
-+ like the RTL8180L (Xterasys Cardbus XN-2411b, Belkin F5D6001) or
-+ the Ralink RT2400 (SMC2635W) without a model number change.
-+
-+ Thanks to Infineon-ADMtek for their support of this driver.
-+
-+config P54_COMMON
-+ tristate "Softmac Prism54 support"
-+ depends on MAC80211 && WLAN_80211 && FW_LOADER && EXPERIMENTAL
-+
-+config P54_USB
-+ tristate "Prism54 USB support"
-+ depends on P54_COMMON && USB
-+ select CRC32
-+
-+config P54_PCI
-+ tristate "Prism54 PCI support"
-+ depends on P54_COMMON && PCI
-+
-+config RT2X00
-+ tristate "Ralink driver support"
-+ depends on MAC80211 && WLAN_80211 && EXPERIMENTAL
-+ ---help---
-+ This will enable the experimental support for the Ralink drivers,
-+ developed in the rt2x00 project <http://rt2x00.serialmonkey.com>.
-+
-+ These drivers will make use of the Devicescape ieee80211 stack.
-+
-+ When building one of the individual drivers, the rt2x00 library
-+ will also be created. That library (when the driver is built as
-+ a module) will be called "rt2x00lib.ko".
-+
-+config RT2X00_LIB
-+ tristate
-+ depends on RT2X00
-+
-+config RT2X00_LIB_PCI
-+ tristate
-+ depends on RT2X00
-+ select RT2X00_LIB
-+
-+config RT2X00_LIB_USB
-+ tristate
-+ depends on RT2X00
-+ select RT2X00_LIB
-+
-+config RT2X00_LIB_FIRMWARE
-+ boolean
-+ depends on RT2X00_LIB
-+ select CRC_ITU_T
-+ select FW_LOADER
-+
-+config RT2X00_LIB_RFKILL
-+ boolean
-+ depends on RT2X00_LIB
-+ select RFKILL
-+ select INPUT_POLLDEV
-+
-+config RT2400PCI
-+ tristate "Ralink rt2400 pci/pcmcia support"
-+ depends on RT2X00 && PCI
-+ select RT2X00_LIB_PCI
-+ select EEPROM_93CX6
-+ ---help---
-+ This is an experimental driver for the Ralink rt2400 wireless chip.
-+
-+ When compiled as a module, this driver will be called "rt2400pci.ko".
-+
-+config RT2400PCI_RFKILL
-+ bool "RT2400 rfkill support"
-+ depends on RT2400PCI
-+ select RT2X00_LIB_RFKILL
-+ ---help---
-+ This adds support for integrated rt2400 devices that feature a
-+ hardware button to control the radio state.
-+ This feature depends on the RF switch subsystem rfkill.
-+
-+config RT2500PCI
-+ tristate "Ralink rt2500 pci/pcmcia support"
-+ depends on RT2X00 && PCI
-+ select RT2X00_LIB_PCI
-+ select EEPROM_93CX6
-+ ---help---
-+ This is an experimental driver for the Ralink rt2500 wireless chip.
-+
-+ When compiled as a module, this driver will be called "rt2500pci.ko".
-+
-+config RT2500PCI_RFKILL
-+ bool "RT2500 rfkill support"
-+ depends on RT2500PCI
-+ select RT2X00_LIB_RFKILL
-+ ---help---
-+ This adds support for integrated rt2500 devices that feature a
[...4086 lines suppressed...]
+ ssb_write32(cc->dev, offset, value);
+}
+
++static inline void chipco_write32_masked(struct ssb_chipcommon *cc, u16 offset,
++ u32 mask, u32 value)
++{
++ value &= mask;
++ value |= chipco_read32(cc, offset) & ~mask;
++ chipco_write32(cc, offset, value);
++}
++
+void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
+ enum ssb_clkmode mode)
+{
@@ -101553,6 +101523,21 @@
+ chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
+}
+
++u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask)
++{
++ return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask;
++}
++
++void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value)
++{
++ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value);
++}
++
++void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value)
++{
++ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value);
++}
++
+#ifdef CONFIG_SSB_SERIAL
+int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
+ struct ssb_serial_port *ports)
@@ -101630,26 +101615,39 @@
+ return nr_ports;
+}
+#endif /* CONFIG_SSB_SERIAL */
-only in patch2:
-unchanged:
---- /dev/null 2007-08-14 08:09:04.507559008 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-08-14 11:32:29.000000000 -0400
-@@ -0,0 +1,92 @@
+--- /dev/null 2007-08-17 08:08:37.519047544 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-08-17 19:56:25.000000000 -0400
+@@ -0,0 +1,117 @@
+menu "Sonics Silicon Backplane"
+
++config SSB_POSSIBLE
++ bool
++ depends on HAS_IOMEM
++ default y
++
+config SSB
+ tristate "Sonics Silicon Backplane support"
-+ depends on HAS_IOMEM
++ depends on SSB_POSSIBLE
+ help
-+ Support for the Sonics Silicon Backplane bus
++ Support for the Sonics Silicon Backplane bus.
++ You only need to enable this option, if you are
++ configuring a kernel for an embedded system with
++ this bus.
++ It will be auto-selected if needed in other
++ environments.
+
-+ The module will be called ssb
++ The module will be called ssb.
+
-+ If unsure, say M
++ If unsure, say N.
++
++config SSB_PCIHOST_POSSIBLE
++ bool
++ depends on SSB && PCI
++ default y
+
+config SSB_PCIHOST
+ bool "Support for SSB on PCI-bus host"
-+ depends on SSB && PCI
++ depends on SSB_PCIHOST_POSSIBLE
+ default y
+ help
+ Support for a Sonics Silicon Backplane on top
@@ -101657,9 +101655,14 @@
+
+ If unsure, say Y
+
++config SSB_PCMCIAHOST_POSSIBLE
++ bool
++ depends on SSB && PCMCIA && EXPERIMENTAL
++ default y
++
+config SSB_PCMCIAHOST
+ bool "Support for SSB on PCMCIA-bus host (EXPERIMENTAL)"
-+ depends on SSB && PCMCIA && EXPERIMENTAL
++ depends on SSB_PCMCIAHOST_POSSIBLE
+ help
+ Support for a Sonics Silicon Backplane on top
+ of a PCMCIA device.
@@ -101668,7 +101671,7 @@
+
+config SSB_SILENT
+ bool "No SSB kernel messages"
-+ depends on SSB
++ depends on SSB && EMBEDDED
+ help
+ This option turns off all Sonics Silicon Backplane printks.
+ Note that you won't be able to identify problems, once
@@ -101692,9 +101695,14 @@
+ depends on SSB
+ # ChipCommon and ExtIf serial support routines.
+
++config SSB_DRIVER_PCICORE_POSSIBLE
++ bool
++ depends on SSB_PCIHOST
++ default y
++
+config SSB_DRIVER_PCICORE
+ bool "SSB PCI core driver"
-+ depends on SSB && SSB_PCIHOST
++ depends on SSB_DRIVER_PCICORE_POSSIBLE
+ help
+ Driver for the Sonics Silicon Backplane attached
+ Broadcom PCI core.
@@ -101727,10 +101735,8 @@
+ If unsure, say N
+
+endmenu
-only in patch2:
-unchanged:
---- /dev/null 2007-08-14 08:09:04.507559008 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-08-14 11:32:29.000000000 -0400
+--- /dev/null 2007-08-17 08:08:37.519047544 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-08-17 19:56:25.000000000 -0400
@@ -0,0 +1,413 @@
+/*
+ * Sonics Silicon Backplane
@@ -102145,11 +102151,9 @@
+ ssb_iounmap(bus);
+ goto out;
+}
-only in patch2:
-unchanged:
---- /dev/null 2007-08-14 08:09:04.507559008 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c 2007-08-14 11:32:29.000000000 -0400
-@@ -0,0 +1,104 @@
+--- /dev/null 2007-08-17 08:08:37.519047544 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c 2007-08-17 19:56:25.000000000 -0400
+@@ -0,0 +1,129 @@
+/*
+ * Sonics Silicon Backplane
+ * Broadcom EXTIF core driver
@@ -102179,6 +102183,14 @@
+ ssb_write32(extif->dev, offset, value);
+}
+
++static inline void extif_write32_masked(struct ssb_extif *extif, u16 offset,
++ u32 mask, u32 value)
++{
++ value &= mask;
++ value |= extif_read32(extif, offset) & ~mask;
++ extif_write32(extif, offset, value);
++}
++
+#ifdef CONFIG_SSB_SERIAL
+static bool serial_exists(u8 *regs)
+{
@@ -102254,10 +102266,25 @@
+ *m = extif_read32(extif, SSB_EXTIF_CLOCK_SB);
+}
+
-only in patch2:
-unchanged:
---- /dev/null 2007-08-14 08:09:04.507559008 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-08-14 11:32:29.000000000 -0400
++u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask)
++{
++ return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask;
++}
++
++void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value)
++{
++ return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUT(0),
++ mask, value);
++}
++
++void ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value)
++{
++ return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUTEN(0),
++ mask, value);
++}
++
+--- /dev/null 2007-08-17 08:08:37.519047544 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-08-17 19:56:25.000000000 -0400
@@ -0,0 +1,576 @@
+/*
+ * Sonics Silicon Backplane
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- kernel.spec 17 Aug 2007 16:05:29 -0000 1.97
+++ kernel.spec 18 Aug 2007 00:38:16 -0000 1.98
@@ -622,11 +622,13 @@
Patch630: linux-2.6-defaults-nonmi.patch
Patch660: linux-2.6-libata-ali-atapi-dma.patch
Patch670: linux-2.6-ata-quirk.patch
+Patch680: linux-2.6-wireless.patch
Patch681: linux-2.6-wireless-pending.patch
Patch690: git-wireless-dev.patch
Patch691: linux-2.6-mac80211-local-mcast-filter.patch
-Patch692: linux-2.6-mac80211-probe-hidden-essid.patch
-Patch693: linux-2.6-iwlwifi-fw-name-compat.patch
+Patch692: linux-2.6-mac80211-rate-limit-wep-bad-keyidx.patch
+Patch693: linux-2.6-ssb-fix-auto-load.patch
+Patch694: linux-2.6-iwlwifi-fw-name-compat.patch
Patch700: linux-2.6-bcm43xx-pci-neuter.patch
Patch710: linux-2.6-netdev-e1000e-01.patch
Patch711: linux-2.6-netdev-e1000e-02.patch
@@ -1104,14 +1106,18 @@
# ia64 ata quirk
ApplyPatch linux-2.6-ata-quirk.patch
+# wireless patches headed for 2.6.23
+ApplyPatch linux-2.6-wireless.patch
# wireless patches staged for 2.6.24
ApplyPatch linux-2.6-wireless-pending.patch
# Add the wireless stack updates and drivers from wireless-dev
ApplyPatch git-wireless-dev.patch
# mac80211: Filter locally-originated multicast frames echoed by AP
ApplyPatch linux-2.6-mac80211-local-mcast-filter.patch
-# mac80211: probe for hidden SSIDs when SSID not found
-ApplyPatch linux-2.6-mac80211-probe-hidden-essid.patch
+# mac80211: rate limit WEP bad keyidx message
+ApplyPatch linux-2.6-mac80211-rate-limit-wep-bad-keyidx.patch
+# ssb: fix auto-load
+ApplyPatch linux-2.6-ssb-fix-auto-load.patch
# temp compat patch for iwlwifi firmware filenames
ApplyPatch linux-2.6-iwlwifi-fw-name-compat.patch
@@ -1748,6 +1754,11 @@
%changelog
+* Fri Aug 17 2007 John W. Linville <linville at redhat.com>
+- Update wireless-dev bits (upstream fixes, b43, ssb)
+- mac80211: rate limit WEP bad keyidx message
+- ssb: fix auto-load
+
* Fri Aug 17 2007 Tom "spot" Callaway <tcallawa at redhat.com>
- sparc64 changes
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-wireless-pending.patch 8 Aug 2007 20:35:05 -0000 1.1
+++ linux-2.6-wireless-pending.patch 18 Aug 2007 00:38:16 -0000 1.2
@@ -1,5 +1,52 @@
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-08-17 19:24:38.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c 2007-08-17 19:28:10.000000000 -0400
+@@ -798,6 +798,20 @@ static int ieee80211_ioctl_giwrate(struc
+ return 0;
+ }
+
++static int ieee80211_ioctl_giwtxpower(struct net_device *dev,
++ struct iw_request_info *info,
++ union iwreq_data *data, char *extra)
++{
++ struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
++
++ data->txpower.fixed = 1;
++ data->txpower.disabled = !(local->hw.conf.radio_enabled);
++ data->txpower.value = local->hw.conf.power_level;
++ data->txpower.flags = IW_TXPOW_DBM;
++
++ return 0;
++}
++
+ static int ieee80211_ioctl_siwrts(struct net_device *dev,
+ struct iw_request_info *info,
+ struct iw_param *rts, char *extra)
+@@ -1580,7 +1594,7 @@ static const iw_handler ieee80211_handle
+ (iw_handler) ieee80211_ioctl_siwfrag, /* SIOCSIWFRAG */
+ (iw_handler) ieee80211_ioctl_giwfrag, /* SIOCGIWFRAG */
+ (iw_handler) NULL, /* SIOCSIWTXPOW */
+- (iw_handler) NULL, /* SIOCGIWTXPOW */
++ (iw_handler) ieee80211_ioctl_giwtxpower, /* SIOCGIWTXPOW */
+ (iw_handler) ieee80211_ioctl_siwretry, /* SIOCSIWRETRY */
+ (iw_handler) ieee80211_ioctl_giwretry, /* SIOCGIWRETRY */
+ (iw_handler) ieee80211_ioctl_siwencode, /* SIOCSIWENCODE */
+--- linux-2.6.22.noarch/net/wireless/radiotap.c.orig 2007-08-17 19:24:38.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/radiotap.c 2007-08-17 19:28:10.000000000 -0400
+@@ -161,7 +161,11 @@ int ieee80211_radiotap_iterator_next(
+ [IEEE80211_RADIOTAP_DBM_TX_POWER] = 0x11,
+ [IEEE80211_RADIOTAP_ANTENNA] = 0x11,
+ [IEEE80211_RADIOTAP_DB_ANTSIGNAL] = 0x11,
+- [IEEE80211_RADIOTAP_DB_ANTNOISE] = 0x11
++ [IEEE80211_RADIOTAP_DB_ANTNOISE] = 0x11,
++ [IEEE80211_RADIOTAP_RX_FLAGS] = 0x22,
++ [IEEE80211_RADIOTAP_TX_FLAGS] = 0x22,
++ [IEEE80211_RADIOTAP_RTS_RETRIES] = 0x11,
++ [IEEE80211_RADIOTAP_DATA_RETRIES] = 0x11,
+ /*
+ * add more here as they are defined in
+ * include/net/ieee80211_radiotap.h
--- linux-2.6.22.noarch/drivers/net/wireless/orinoco_tmd.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/orinoco_tmd.c 2007-08-08 16:01:01.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/orinoco_tmd.c 2007-08-17 19:28:01.000000000 -0400
@@ -190,7 +190,7 @@ static int orinoco_tmd_init_one(struct p
static void __devexit orinoco_tmd_remove_one(struct pci_dev *pdev)
{
@@ -9,8 +56,8 @@
struct orinoco_pci_card *card = priv->card;
unregister_netdev(dev);
---- linux-2.6.22.noarch/drivers/net/wireless/airo.c.orig 2007-08-08 16:00:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/airo.c 2007-08-08 16:01:01.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/airo.c.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/airo.c 2007-08-17 19:28:01.000000000 -0400
@@ -241,8 +241,8 @@ static int proc_perm = 0644;
MODULE_AUTHOR("Benjamin Reed");
@@ -23,7 +70,7 @@
MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350");
module_param_array(io, int, NULL, 0);
--- linux-2.6.22.noarch/drivers/net/wireless/strip.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/strip.c 2007-08-08 16:01:01.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/strip.c 2007-08-17 19:28:01.000000000 -0400
@@ -2571,7 +2571,7 @@ static struct strip *strip_alloc(void)
return NULL; /* If no more memory, return */
@@ -34,7 +81,7 @@
strip_info->magic = STRIP_MAGIC;
--- linux-2.6.22.noarch/drivers/net/wireless/ray_cs.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ray_cs.c 2007-08-08 16:01:01.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ray_cs.c 2007-08-17 19:28:01.000000000 -0400
@@ -314,7 +314,7 @@ static int ray_probe(struct pcmcia_devic
if (!dev)
goto fail_alloc_dev;
@@ -332,8 +379,8 @@
if (!local)
return 0;
---- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig 2007-08-08 16:00:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h 2007-08-08 16:01:01.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h 2007-08-17 19:28:01.000000000 -0400
@@ -871,11 +871,6 @@ static inline int zd_chip_set_basic_rate
return r;
}
@@ -346,8 +393,8 @@
int zd_chip_lock_phy_regs(struct zd_chip *chip);
int zd_chip_unlock_phy_regs(struct zd_chip *chip);
---- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig 2007-08-08 16:00:43.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c 2007-08-08 16:01:01.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c 2007-08-17 19:28:01.000000000 -0400
@@ -161,13 +161,33 @@ void zd_mac_clear(struct zd_mac *mac)
ZD_MEMCLEAR(mac, sizeof(struct zd_mac));
}
@@ -430,8 +477,8 @@
return 0;
}
---- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Makefile 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Makefile 2007-08-17 19:28:01.000000000 -0400
@@ -43,7 +43,7 @@ obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o
@@ -441,8 +488,8 @@
rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o
obj-$(CONFIG_RTL8187) += rtl8187.o
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.h 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.h 2007-08-17 19:28:01.000000000 -0400
@@ -4,9 +4,6 @@
#ifndef _WLAN_WEXT_H_
#define _WLAN_WEXT_H_
@@ -468,8 +515,8 @@
-int wlan_radio_ioctl(wlan_private * priv, u8 option);
#endif /* _WLAN_WEXT_H_ */
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/dev.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/dev.h 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/dev.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/dev.h 2007-08-17 19:28:01.000000000 -0400
@@ -14,7 +14,6 @@
#include "defs.h"
@@ -673,8 +720,8 @@
u8 fw_ready;
u8 last_scanned_channel;
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c 2007-08-17 19:28:01.000000000 -0400
@@ -22,60 +22,6 @@
@@ -1393,8 +1440,8 @@
/* Check the size of the string */
if (in_ssid_len > IW_ESSID_MAX_SIZE) {
ret = -E2BIG;
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c 2007-08-17 19:28:01.000000000 -0400
@@ -85,12 +85,12 @@ static u8 wlan_getavgnf(wlan_private * p
static void wlan_save_rawSNRNF(wlan_private * priv, struct rxpd *p_rx_pd)
{
@@ -1597,8 +1644,8 @@
wlan_compute_rssi(priv, prxpd);
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/Makefile.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/Makefile 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/Makefile.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/Makefile 2007-08-17 19:28:01.000000000 -0400
@@ -1,12 +1,13 @@
-libertas-objs := main.o fw.o wext.o \
+libertas-objs := main.o wext.o \
@@ -1615,8 +1662,8 @@
obj-$(CONFIG_LIBERTAS) += libertas.o
obj-$(CONFIG_LIBERTAS_USB) += usb8xxx.o
+obj-$(CONFIG_LIBERTAS_CS) += libertas_cs.o
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/assoc.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/assoc.h 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/assoc.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/assoc.h 2007-08-17 19:28:01.000000000 -0400
@@ -17,7 +17,7 @@ static inline void wlan_postpone_associa
if (priv->adapter->surpriseremoved)
return;
@@ -1626,8 +1673,8 @@
}
static inline void wlan_cancel_association_work(wlan_private *priv)
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c 2007-08-17 19:28:01.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/etherdevice.h>
#include <linux/netdevice.h>
@@ -2853,8 +2900,8 @@
module_init(libertas_init_module);
module_exit(libertas_exit_module);
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/debugfs.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/debugfs.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/debugfs.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/debugfs.c 2007-08-17 19:28:01.000000000 -0400
@@ -66,24 +66,23 @@ static ssize_t libertas_getscantable(str
struct bss_descriptor * iter_bss;
@@ -3315,8 +3362,8 @@
mdelay(10);
res = count;
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c 2007-08-17 19:28:01.000000000 -0400
@@ -15,7 +15,7 @@
static void cleanup_cmdnode(struct cmd_ctrl_node *ptempnode);
@@ -5063,8 +5110,8 @@
- lbs_deb_leave(LBS_DEB_CMD);
+ lbs_deb_leave(LBS_DEB_HOST);
}
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.c 2007-08-17 19:28:01.000000000 -0400
@@ -15,13 +15,14 @@
#include "defs.h"
#include "dev.h"
@@ -5486,8 +5533,8 @@
/* API unregisters the driver from USB subsystem */
usb_deregister(&if_usb_driver);
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/11d.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/11d.h 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/11d.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/11d.h 2007-08-17 19:28:01.000000000 -0400
@@ -83,8 +83,6 @@ u8 libertas_get_scan_type_11d(u8 chan,
u32 libertas_chan_2_freq(u8 chan, u8 band);
@@ -5506,8 +5553,8 @@
int libertas_ret_802_11d_domain_info(wlan_private * priv,
struct cmd_ds_command *resp);
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/join.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/join.h 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/join.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/join.h 2007-08-17 19:28:01.000000000 -0400
@@ -12,45 +12,42 @@
#include "dev.h"
@@ -5570,8 +5617,8 @@
+void libertas_unset_basic_rate_flags(u8 * rates, size_t len);
+
#endif
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/scan.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/scan.h 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/scan.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/scan.h 2007-08-17 19:28:01.000000000 -0400
@@ -140,8 +140,7 @@ struct bss_descriptor {
u8 ssid[IW_ESSID_MAX_SIZE + 1];
u8 ssid_len;
@@ -5661,8 +5708,8 @@
+void libertas_scan_worker(struct work_struct *work);
+
#endif /* _WLAN_SCAN_H */
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/types.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/types.h 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/types.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/types.h 2007-08-17 19:28:01.000000000 -0400
@@ -7,71 +7,6 @@
#include <linux/if_ether.h>
#include <asm/byteorder.h>
@@ -5744,8 +5791,8 @@
__le16 statuscode;
__le16 aid;
u8 iebuffer[1];
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/fw.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/fw.c 2007-08-08 16:02:37.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/fw.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/fw.c 2007-08-17 19:28:01.000000000 -0400
@@ -1,349 +0,0 @@
-/**
- * This file contains the initialization for FW and HW
@@ -6096,8 +6143,8 @@
-
- return;
-}
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/host.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/host.h 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/host.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/host.h 2007-08-17 19:28:01.000000000 -0400
@@ -20,224 +20,163 @@
#define OID_802_11_TX_RETRYCOUNT 0x0000801D
#define OID_802_11D_ENABLE 0x00008020
@@ -6606,8 +6653,8 @@
};
/** Card Event definition */
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/join.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/join.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/join.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/join.c 2007-08-17 19:28:01.000000000 -0400
@@ -17,10 +17,16 @@
#include "dev.h"
#include "assoc.h"
@@ -7426,8 +7473,8 @@
done:
lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/scan.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/scan.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/scan.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/scan.c 2007-08-17 19:28:01.000000000 -0400
@@ -17,6 +17,7 @@
#include "decl.h"
#include "dev.h"
@@ -8427,8 +8474,8 @@
/* Copy the locally created newbssentry to the scan table */
memcpy(found, &new, offsetof(struct bss_descriptor, list));
}
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/11d.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/11d.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/11d.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/11d.c 2007-08-17 19:28:01.000000000 -0400
@@ -124,17 +124,17 @@ static u8 wlan_channel_known_11d(u8 chan
u8 nr_chan = parsed_region_chan->nr_chan;
u8 i = 0;
@@ -8776,8 +8823,8 @@
goto done;
}
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/if_bootcmd.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_bootcmd.c 2007-08-08 16:02:37.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/if_bootcmd.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_bootcmd.c 2007-08-17 19:28:01.000000000 -0400
@@ -1,40 +0,0 @@
-/**
- * This file contains functions used in USB Boot command
@@ -8819,8 +8866,8 @@
-
- return 0;
-}
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/defs.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/defs.h 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/defs.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/defs.h 2007-08-17 19:28:01.000000000 -0400
@@ -43,43 +43,43 @@
extern unsigned int libertas_debug;
@@ -9067,8 +9114,8 @@
};
/** KEY_TYPE_ID */
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/cmdresp.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/cmdresp.c 2007-08-17 19:28:01.000000000 -0400
@@ -28,10 +28,10 @@ void libertas_mac_event_disconnected(wla
wlan_adapter *adapter = priv->adapter;
union iwreq_data wrqu;
@@ -9979,8 +10026,8 @@
+ lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
return ret;
}
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/assoc.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/assoc.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/assoc.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/assoc.c 2007-08-17 19:28:01.000000000 -0400
@@ -57,10 +57,8 @@ static int assoc_helper_essid(wlan_priva
lbs_deb_assoc("New SSID requested: '%s'\n",
escape_essid(assoc_req->ssid, assoc_req->ssid_len));
@@ -10241,8 +10288,8 @@
}
if (!test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/hostcmd.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/hostcmd.h 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/hostcmd.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/hostcmd.h 2007-08-17 19:28:01.000000000 -0400
@@ -83,23 +83,12 @@ struct cmd_ctrl_node {
wait_queue_head_t cmdwait_q;
};
@@ -10427,8 +10474,8 @@
struct cmd_ds_get_tsf gettsf;
struct cmd_ds_802_11_subscribe_event subscribe_event;
} params;
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c 2007-08-17 19:28:01.000000000 -0400
@@ -58,7 +58,6 @@ static u32 convert_radiotap_rate_to_mv(u
*/
static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
@@ -10565,8 +10612,8 @@
}
}
EXPORT_SYMBOL_GPL(libertas_send_tx_feedback);
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c 2007-08-08 16:01:07.000000000 -0400
+--- /dev/null 2007-08-17 08:08:37.519047544 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c 2007-08-17 19:28:01.000000000 -0400
@@ -0,0 +1,1005 @@
+/*
+
@@ -11573,8 +11620,8 @@
+
+module_init(if_cs_init);
+module_exit(if_cs_exit);
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h 2007-08-08 16:02:37.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h 2007-08-17 19:28:01.000000000 -0400
@@ -1,52 +0,0 @@
-#ifndef __WLAN_THREAD_H_
-#define __WLAN_THREAD_H_
@@ -11628,8 +11675,8 @@
-}
-
-#endif
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h 2007-08-17 19:28:01.000000000 -0400
@@ -102,8 +102,4 @@ struct fwsyncheader {
#define FW_DATA_XMIT_SIZE \
sizeof(struct fwheader) + le32_to_cpu(fwdata->fwheader.datalength) + sizeof(u32)
@@ -11639,8 +11686,8 @@
-int if_usb_issue_boot_command(wlan_private *priv, int ivalue);
-
#endif
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c 2007-08-17 19:28:01.000000000 -0400
@@ -72,9 +72,9 @@ static int libertas_ethtool_get_eeprom(s
regctrl.action, regctrl.offset, regctrl.NOB);
@@ -11664,8 +11711,8 @@
if (ret) {
ret = 0;
---- linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig 2007-08-08 16:02:00.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h 2007-08-17 19:28:01.000000000 -0400
@@ -15,14 +15,9 @@ struct wlan_private;
struct sk_buff;
struct net_device;
@@ -11721,8 +11768,8 @@
+int libertas_reset_device(wlan_private *priv);
#endif /* _WLAN_DECL_H_ */
---- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2007-08-08 16:00:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2007-08-08 16:01:01.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2007-08-17 19:28:01.000000000 -0400
@@ -1753,7 +1753,7 @@ prism54_get_oid(struct net_device *ndev,
int rvalue;
enum oid_num_t n = dwrq->flags;
@@ -11751,7 +11798,7 @@
void
--- linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c 2007-08-08 16:01:01.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c 2007-08-17 19:28:01.000000000 -0400
@@ -244,13 +244,11 @@ mgt_init(islpci_private *priv)
/* Alloc the cache */
for (i = 0; i < OID_NUM_LAST; i++) {
@@ -11767,8 +11814,8 @@
} else
priv->mib[i] = NULL;
}
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig 2007-08-08 16:00:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-08-08 16:01:07.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-08-17 19:28:01.000000000 -0400
@@ -63,11 +63,6 @@ config WAVELAN
a Radio LAN (wireless Ethernet-like Local Area Network) using the
radio frequencies 900 MHz and 2.4 GHz.
@@ -11903,8 +11950,8 @@
config PCMCIA_WL3501
tristate "Planet WL3501 PCMCIA cards"
depends on EXPERIMENTAL && PCMCIA && WLAN_80211
---- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig 2007-08-08 16:00:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c 2007-08-08 16:01:01.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c 2007-08-17 19:28:01.000000000 -0400
@@ -859,7 +859,7 @@ static int wl3501_esbq_confirm(struct wl
static void wl3501_online(struct net_device *dev)
@@ -12202,7 +12249,7 @@
wl3501_reset(dev);
netif_device_attach(dev);
--- linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c 2007-08-08 16:01:01.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c 2007-08-17 19:28:01.000000000 -0400
@@ -435,7 +435,7 @@ static int arlan_sysctl_info(ctl_table *
goto final;
}
@@ -12267,7 +12314,7 @@
} else
--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h 2007-08-08 16:01:01.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h 2007-08-17 19:28:01.000000000 -0400
@@ -3,6 +3,7 @@
#include <linux/wireless.h>
@@ -12285,8 +12332,8 @@
u16 infofid; /* MAC buffer id for info frame */
/* txfid, intransmitfid, next_txtid, and next_alloc are protected by
* txfidlock */
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2007-08-08 16:00:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c 2007-08-08 16:01:01.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c 2007-08-17 19:28:01.000000000 -0400
@@ -272,7 +272,7 @@ static int sandisk_enable_wireless(struc
{
int res, ret = 0;
@@ -12297,7 +12344,7 @@
tuple_t tuple;
cisparse_t *parse = NULL;
--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c 2007-08-08 16:01:01.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c 2007-08-17 19:28:01.000000000 -0400
@@ -825,7 +825,7 @@ static int hfa384x_get_rid(struct net_de
local->hw_downloading)
return -ENODEV;
@@ -12367,8 +12414,8 @@
local = iface->local;
/* Send disconnect event, e.g., to trigger reassociation after resume
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2007-08-08 16:00:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2007-08-08 16:01:01.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2007-08-17 19:24:36.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2007-08-17 19:28:01.000000000 -0400
@@ -3088,7 +3088,7 @@ static int prism2_ioctl_priv_download(lo
static int prism2_set_genericelement(struct net_device *dev, u8 *elem,
size_t len)
--- linux-2.6-mac80211-probe-hidden-essid.patch DELETED ---
More information about the fedora-extras-commits
mailing list