rpms/kernel/devel config-generic, 1.17, 1.18 git-wireless-dev.patch, 1.29, 1.30 kernel.spec, 1.87, 1.88 linux-2.6-mac80211-local-mcast-filter.patch, 1.2, 1.3 linux-2.6-mac80211-probe-hidden-essid.patch, 1.1, 1.2
John W. Linville (linville)
fedora-extras-commits at redhat.com
Tue Aug 14 16:00:01 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11646
Modified Files:
config-generic git-wireless-dev.patch kernel.spec
linux-2.6-mac80211-local-mcast-filter.patch
linux-2.6-mac80211-probe-hidden-essid.patch
Log Message:
Update wireless-dev bits (mac80211, bcm43xx -> b43, ssb)
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- config-generic 12 Aug 2007 04:22:59 -0000 1.17
+++ config-generic 14 Aug 2007 15:59:19 -0000 1.18
@@ -1216,15 +1216,15 @@
CONFIG_ATMEL=m
CONFIG_BCM43XX=m
CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_MAC80211=m
-CONFIG_BCM43XX_MAC80211_PCI=y
-CONFIG_BCM43XX_MAC80211_PCMCIA=y
-CONFIG_BCM43XX_MAC80211_DEBUG=y
-CONFIG_BCM43XX_MAC80211_DMA=y
-CONFIG_BCM43XX_MAC80211_PIO=y
-CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
-# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_B43=m
+CONFIG_B43_PCI=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_DEBUG=y
+CONFIG_B43_DMA=y
+CONFIG_B43_PIO=y
+CONFIG_B43_DMA_AND_PIO_MODE=y
+# CONFIG_B43_DMA_MODE is not set
+# CONFIG_B43_PIO_MODE is not set
CONFIG_HERMES=m
CONFIG_HOSTAP=m
CONFIG_HOSTAP_PCI=m
git-wireless-dev.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.29 -r 1.30 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- git-wireless-dev.patch 8 Aug 2007 20:33:55 -0000 1.29
+++ git-wireless-dev.patch 14 Aug 2007 15:59:19 -0000 1.30
@@ -1,5 +1,390 @@
---- linux-2.6.22.noarch/CREDITS.orig 2007-08-08 16:02:52.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS 2007-08-08 16:07:19.000000000 -0400
+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
[...131829 lines suppressed...]
+#include "ssb_private.h"
+
+
++/* Define the following to 1 to enable a printk on each coreswitch. */
++#define SSB_VERBOSE_PCICORESWITCH_DEBUG 0
++
++
+/* Lowlevel coreswitching */
+int ssb_pci_switch_coreidx(struct ssb_bus *bus, u8 coreidx)
+{
@@ -91687,10 +100559,12 @@
+ int err;
+ unsigned long flags;
+
-+ ssb_dprintk(KERN_INFO PFX
-+ "Switching to %s core, index %d\n",
-+ ssb_core_name(dev->id.coreid),
-+ dev->core_index);
++#if SSB_VERBOSE_PCICORESWITCH_DEBUG
++ ssb_printk(KERN_INFO PFX
++ "Switching to %s core, index %d\n",
++ ssb_core_name(dev->id.coreid),
++ dev->core_index);
++#endif
+
+ spin_lock_irqsave(&bus->bar_lock, flags);
+ err = ssb_pci_switch_coreidx(bus, dev->core_index);
@@ -92328,9 +101202,11 @@
+out:
+ return err;
+}
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-08-08 16:07:19.000000000 -0400
-@@ -0,0 +1,425 @@
+only in patch2:
+unchanged:
+--- /dev/null 2007-08-14 08:09:04.507559008 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-08-14 11:32:29.000000000 -0400
+@@ -0,0 +1,423 @@
+/*
+ * Sonics Silicon Backplane
+ * Broadcom ChipCommon core driver
@@ -92708,10 +101584,8 @@
+ } else if (cc->dev->id.revision >= 3) {
+ /* Internal backplane clock */
+ baud_base = ssb_clockspeed(bus);
-+ div = 2; /* Minimum divisor */
-+ chipco_write32(cc, SSB_CHIPCO_CLKDIV,
-+ (chipco_read32(cc, SSB_CHIPCO_CLKDIV)
-+ & ~SSB_CHIPCO_CLKDIV_UART) | div);
++ div = chipco_read32(cc, SSB_CHIPCO_CLKDIV)
++ & SSB_CHIPCO_CLKDIV_UART;
+ } else {
+ /* Fixed internal backplane clock */
+ baud_base = 88000000;
@@ -92756,14 +101630,16 @@
+ return nr_ports;
+}
+#endif /* CONFIG_SSB_SERIAL */
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-08-08 16:07:19.000000000 -0400
+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 @@
+menu "Sonics Silicon Backplane"
+
+config SSB
+ tristate "Sonics Silicon Backplane support"
-+ depends on EXPERIMENTAL && HAS_IOMEM
++ depends on HAS_IOMEM
+ help
+ Support for the Sonics Silicon Backplane bus
+
@@ -92782,8 +101658,8 @@
+ If unsure, say Y
+
+config SSB_PCMCIAHOST
-+ bool "Support for SSB on PCMCIA-bus host"
-+ depends on SSB && PCMCIA
++ bool "Support for SSB on PCMCIA-bus host (EXPERIMENTAL)"
++ depends on SSB && PCMCIA && EXPERIMENTAL
+ help
+ Support for a Sonics Silicon Backplane on top
+ of a PCMCIA device.
@@ -92826,14 +101702,14 @@
+ If unsure, say Y
+
+config SSB_PCICORE_HOSTMODE
-+ bool "Hostmode support for SSB PCI core"
-+ depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS
++ bool "Hostmode support for SSB PCI core (EXPERIMENTAL)"
++ depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS && EXPERIMENTAL
+ help
+ PCIcore hostmode operation (external PCI bus).
+
+config SSB_DRIVER_MIPS
-+ bool "SSB Broadcom MIPS core driver"
-+ depends on SSB && MIPS
++ bool "SSB Broadcom MIPS core driver (EXPERIMENTAL)"
++ depends on SSB && MIPS && EXPERIMENTAL
+ select SSB_SERIAL
+ help
+ Driver for the Sonics Silicon Backplane attached
@@ -92842,8 +101718,8 @@
+ If unsure, say N
+
+config SSB_DRIVER_EXTIF
-+ bool "SSB Broadcom EXTIF core driver"
-+ depends on SSB_DRIVER_MIPS
++ bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)"
++ depends on SSB_DRIVER_MIPS && EXPERIMENTAL
+ help
+ Driver for the Sonics Silicon Backplane attached
+ Broadcom EXTIF core.
@@ -92851,8 +101727,10 @@
+ If unsure, say N
+
+endmenu
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-08-08 16:07:19.000000000 -0400
+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
@@ -0,0 +1,413 @@
+/*
+ * Sonics Silicon Backplane
@@ -93267,8 +102145,10 @@
+ ssb_iounmap(bus);
+ goto out;
+}
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c 2007-08-08 16:07:19.000000000 -0400
+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 @@
+/*
+ * Sonics Silicon Backplane
@@ -93374,9 +102254,11 @@
+ *m = extif_read32(extif, SSB_EXTIF_CLOCK_SB);
+}
+
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-08-08 16:07:19.000000000 -0400
-@@ -0,0 +1,568 @@
+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
+@@ -0,0 +1,576 @@
+/*
+ * Sonics Silicon Backplane
+ * Broadcom PCI-core driver
@@ -93478,10 +102360,13 @@
+
+ /* Enable PCI bridge BAR1 prefetch and burst */
+ pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3);
++
++ /* Make sure our latency is high enough to handle the devices behind us */
++ pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xa8);
+}
+DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_fixup_pcibridge);
+
-+int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
++int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+ return ssb_mips_irq(extpci_core->dev) + 2;
+}
@@ -93609,7 +102494,7 @@
+ val = *((const u32 *)buf);
+ break;
+ }
-+ writel(*((const u32 *)buf), mmio);
++ writel(val, mmio);
+
+ err = 0;
+unmap:
@@ -93690,6 +102575,8 @@
+ udelay(150); /* Assertion time demanded by the PCI standard */
+ val |= SSB_PCICORE_CTL_RST; /* Deassert RST# */
+ pcicore_write32(pc, SSB_PCICORE_CTL, val);
++ val = SSB_PCICORE_ARBCTL_INTERN;
++ pcicore_write32(pc, SSB_PCICORE_ARBCTL, val);
+ udelay(1); /* Assertion time demanded by the PCI standard */
+
+ /*TODO cardbus mode */
@@ -93719,6 +102606,9 @@
+ * The following needs change, if we want to port hostmode
+ * to non-MIPS platform. */
+ set_io_port_base((unsigned long)ioremap_nocache(SSB_PCI_MEM, 0x04000000));
++ /* Give some time to the PCI controller to configure itself with the new
++ * values. Not waiting at this point causes crashes of the machine. */
++ mdelay(10);
+ register_pci_controller(&ssb_pcicore_controller);
+}
+
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kernel.spec 13 Aug 2007 19:45:49 -0000 1.87
+++ kernel.spec 14 Aug 2007 15:59:21 -0000 1.88
@@ -1739,6 +1739,9 @@
%changelog
+* Tue Aug 14 2007 John W. Linville <linville at redhat.com>
+- Update wireless-dev bits (mac80211, bcm43xx -> b43, ssb)
+
* Mon Aug 13 2007 Dave Jones <davej at redhat.com>
- Add patch-2.6.23-rc3-hrt2.patch, bringing X86-64 tickless back.
linux-2.6-mac80211-local-mcast-filter.patch:
Index: linux-2.6-mac80211-local-mcast-filter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-mac80211-local-mcast-filter.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-mac80211-local-mcast-filter.patch 6 Aug 2007 23:58:59 -0000 1.2
+++ linux-2.6-mac80211-local-mcast-filter.patch 14 Aug 2007 15:59:21 -0000 1.3
@@ -11,14 +11,12 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
- net/mac80211/ieee80211.c | 5 +++--
+ net/mac80211/rx.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
-index a42e70e..0097b0a 100644
---- a/net/mac80211/ieee80211.c
-+++ b/net/mac80211/ieee80211.c
-@@ -3030,9 +3030,10 @@ ieee80211_rx_h_data(struct ieee80211_txrx_data *rx)
+--- linux-2.6.22.noarch/net/mac80211/rx.c.orig 2007-08-14 11:43:23.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/rx.c 2007-08-14 11:43:19.000000000 -0400
+@@ -1088,9 +1088,10 @@ ieee80211_rx_h_data(struct ieee80211_txr
memcpy(dst, hdr->addr1, ETH_ALEN);
memcpy(src, hdr->addr3, ETH_ALEN);
linux-2.6-mac80211-probe-hidden-essid.patch:
Index: linux-2.6-mac80211-probe-hidden-essid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-mac80211-probe-hidden-essid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-mac80211-probe-hidden-essid.patch 6 Aug 2007 23:58:59 -0000 1.1
+++ linux-2.6-mac80211-probe-hidden-essid.patch 14 Aug 2007 15:59:21 -0000 1.2
@@ -5,22 +5,21 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
- net/mac80211/ieee80211_sta.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ net/mac80211/ieee80211_sta.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
-index 007dd08..9f467cc 100644
---- a/net/mac80211/ieee80211_sta.c
-+++ b/net/mac80211/ieee80211_sta.c
-@@ -3217,7 +3217,10 @@ static int ieee80211_sta_config_auth(struct net_device *dev,
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig 2007-08-14 11:40:38.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c 2007-08-14 11:47:06.000000000 -0400
+@@ -3129,7 +3129,11 @@ static int ieee80211_sta_config_auth(str
return 0;
} else {
if (ifsta->state != IEEE80211_AUTHENTICATE) {
- ieee80211_sta_start_scan(dev, NULL, 0);
-+ ieee80211_sta_start_scan(dev, ifsta->auto_ssid_sel ?
-+ NULL : ifsta->ssid,
-+ ifsta->auto_ssid_sel ?
-+ 0 : ifsta->ssid_len);
++ 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
More information about the fedora-extras-commits
mailing list