rpms/kernel/devel kernel.spec, 1.591, 1.592 linux-2.6-wireless-pending.patch, 1.42, 1.43 linux-2.6-wireless.patch, 1.32, 1.33

John W. Linville (linville) fedora-extras-commits at redhat.com
Tue Apr 8 03:39:32 UTC 2008 

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4512

Modified Files:
	kernel.spec linux-2.6-wireless-pending.patch 
	linux-2.6-wireless.patch 
Log Message:
wireless fixes from 2008-04-07


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.591
retrieving revision 1.592
diff -u -r1.591 -r1.592
--- kernel.spec	8 Apr 2008 02:46:08 -0000	1.591
+++ kernel.spec	8 Apr 2008 03:38:38 -0000	1.592
@@ -1118,7 +1118,7 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 
 # wireless patches headed for 2.6.25
-#ApplyPatch linux-2.6-wireless.patch
+ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.26
 ApplyPatch linux-2.6-wireless-pending.patch
 
@@ -1761,6 +1761,13 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Apr 07 2008 John W. Linville <linville at redhat.com>
+- iwlwifi: fix n-band association problem
+- ipw2200: set MAC address on radiotap interface
+- libertas: fix mode initialization problem
+- nl80211: fix STA AID bug
+- b43legacy: fix bcm4303 crash
+
 * Mon Apr 07 2008 Chuck Ebbert <cebbert at redhat.com>
 - Fix CONFIG_USB_DEBUG so it's disabled properly with 'make release'.
 

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.42 -r 1.43 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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- linux-2.6-wireless-pending.patch	2 Apr 2008 01:21:33 -0000	1.42
+++ linux-2.6-wireless-pending.patch	8 Apr 2008 03:38:38 -0000	1.43
@@ -5468,8 +5468,8 @@
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
 diff -up linux-2.6.24.noarch/include/linux/nl80211.h.orig linux-2.6.24.noarch/include/linux/nl80211.h
---- linux-2.6.24.noarch/include/linux/nl80211.h.orig	2008-04-01 20:38:38.000000000 -0400
-+++ linux-2.6.24.noarch/include/linux/nl80211.h	2008-04-01 20:48:57.000000000 -0400
+--- linux-2.6.24.noarch/include/linux/nl80211.h.orig	2008-04-07 23:22:03.000000000 -0400
++++ linux-2.6.24.noarch/include/linux/nl80211.h	2008-04-07 23:33:46.000000000 -0400
 @@ -78,6 +78,18 @@
   *	or, if no MAC address given, all stations, on the interface identified
   *	by %NL80211_ATTR_IFINDEX.
@@ -5749,8 +5749,8 @@
  
  #endif /* __LINUX_NL80211_H */
 diff -up linux-2.6.24.noarch/include/linux/wireless.h.orig linux-2.6.24.noarch/include/linux/wireless.h
---- linux-2.6.24.noarch/include/linux/wireless.h.orig	2008-04-01 20:38:38.000000000 -0400
-+++ linux-2.6.24.noarch/include/linux/wireless.h	2008-04-01 20:48:58.000000000 -0400
+--- linux-2.6.24.noarch/include/linux/wireless.h.orig	2008-04-07 23:22:04.000000000 -0400
++++ linux-2.6.24.noarch/include/linux/wireless.h	2008-04-07 23:33:46.000000000 -0400
 @@ -455,6 +455,7 @@
  #define IW_MODE_REPEAT	4	/* Wireless Repeater (forwarder) */
  #define IW_MODE_SECOND	5	/* Secondary master/repeater (backup) */
@@ -5760,8 +5760,8 @@
  /* Statistics flags (bitmask in updated) */
  #define IW_QUAL_QUAL_UPDATED	0x01	/* Value was updated since last read */
 diff -up linux-2.6.24.noarch/include/linux/ieee80211.h.orig linux-2.6.24.noarch/include/linux/ieee80211.h
---- linux-2.6.24.noarch/include/linux/ieee80211.h.orig	2008-04-01 20:38:38.000000000 -0400
-+++ linux-2.6.24.noarch/include/linux/ieee80211.h	2008-04-01 20:48:58.000000000 -0400
+--- linux-2.6.24.noarch/include/linux/ieee80211.h.orig	2008-04-07 23:22:02.000000000 -0400
++++ linux-2.6.24.noarch/include/linux/ieee80211.h	2008-04-07 23:33:46.000000000 -0400
 @@ -97,6 +97,7 @@
  #define IEEE80211_MAX_FRAME_LEN		2352
  
@@ -5826,8 +5826,8 @@
  	WLAN_EID_PWR_CONSTRAINT = 32,
  	WLAN_EID_PWR_CAPABILITY = 33,
 diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h
---- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig	2008-04-01 20:38:38.000000000 -0400
-+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2008-04-01 20:48:58.000000000 -0400
+--- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig	2008-04-07 23:22:03.000000000 -0400
++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2008-04-07 23:33:46.000000000 -0400
 @@ -390,6 +390,10 @@ extern void ssb_chipco_set_clockmode(str
  extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc,
  					  u32 ticks);
@@ -5840,8 +5840,8 @@
  u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask);
  u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value);
 diff -up /dev/null linux-2.6.24.noarch/include/linux/ssb/ssb_driver_gige.h
---- /dev/null	2008-04-01 10:36:34.721293558 -0400
-+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_gige.h	2008-04-01 20:48:58.000000000 -0400
+--- /dev/null	2008-04-07 22:07:49.954007376 -0400
++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_gige.h	2008-04-07 23:33:46.000000000 -0400
 @@ -0,0 +1,174 @@
 +#ifndef LINUX_SSB_DRIVER_GIGE_H_
 +#define LINUX_SSB_DRIVER_GIGE_H_
@@ -6018,8 +6018,8 @@
 +#endif /* CONFIG_SSB_DRIVER_GIGE */
 +#endif /* LINUX_SSB_DRIVER_GIGE_H_ */
 diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h
---- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h.orig	2008-04-01 20:38:38.000000000 -0400
-+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h	2008-04-01 20:48:58.000000000 -0400
+--- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h.orig	2008-04-07 23:22:03.000000000 -0400
++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h	2008-04-07 23:33:46.000000000 -0400
 @@ -1,6 +1,11 @@
  #ifndef LINUX_SSB_PCICORE_H_
  #define LINUX_SSB_PCICORE_H_
@@ -6060,8 +6060,8 @@
  #endif /* CONFIG_SSB_DRIVER_PCICORE */
  #endif /* LINUX_SSB_PCICORE_H_ */
 diff -up linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb.h
---- linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig	2008-04-01 20:38:38.000000000 -0400
-+++ linux-2.6.24.noarch/include/linux/ssb/ssb.h	2008-04-01 20:48:58.000000000 -0400
+--- linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig	2008-04-07 23:22:03.000000000 -0400
++++ linux-2.6.24.noarch/include/linux/ssb/ssb.h	2008-04-07 23:33:46.000000000 -0400
 @@ -72,8 +72,10 @@ struct ssb_device;
  /* Lowlevel read/write operations on the device MMIO.
   * Internal, don't use that outside of ssb. */
@@ -6122,7 +6122,7 @@
  #endif /* LINUX_SSB_H_ */
 diff -up linux-2.6.24.noarch/include/net/wireless.h.orig linux-2.6.24.noarch/include/net/wireless.h
 --- linux-2.6.24.noarch/include/net/wireless.h.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/include/net/wireless.h	2008-04-01 20:48:58.000000000 -0400
++++ linux-2.6.24.noarch/include/net/wireless.h	2008-04-07 23:33:46.000000000 -0400
 @@ -13,6 +13,162 @@
  #include <net/cfg80211.h>
  
@@ -6329,8 +6329,8 @@
 +}
  #endif /* __NET_WIRELESS_H */
 diff -up linux-2.6.24.noarch/include/net/cfg80211.h.orig linux-2.6.24.noarch/include/net/cfg80211.h
---- linux-2.6.24.noarch/include/net/cfg80211.h.orig	2008-04-01 20:38:39.000000000 -0400
-+++ linux-2.6.24.noarch/include/net/cfg80211.h	2008-04-01 20:48:58.000000000 -0400
+--- linux-2.6.24.noarch/include/net/cfg80211.h.orig	2008-04-07 23:22:04.000000000 -0400
++++ linux-2.6.24.noarch/include/net/cfg80211.h	2008-04-07 23:33:46.000000000 -0400
 @@ -12,6 +12,16 @@
   * Copyright 2006, 2007	Johannes Berg <johannes at sipsolutions.net>
   */
@@ -6552,8 +6552,8 @@
  
  #endif /* __NET_CFG80211_H */
 diff -up linux-2.6.24.noarch/include/net/ieee80211.h.orig linux-2.6.24.noarch/include/net/ieee80211.h
---- linux-2.6.24.noarch/include/net/ieee80211.h.orig	2008-04-01 20:38:39.000000000 -0400
-+++ linux-2.6.24.noarch/include/net/ieee80211.h	2008-04-01 20:48:58.000000000 -0400
+--- linux-2.6.24.noarch/include/net/ieee80211.h.orig	2008-04-07 23:22:04.000000000 -0400
++++ linux-2.6.24.noarch/include/net/ieee80211.h	2008-04-07 23:33:46.000000000 -0400
 @@ -183,7 +183,6 @@ const char *escape_essid(const char *ess
  #define IEEE80211_DEBUG_RX(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_RX, f, ## a)
  #define IEEE80211_DEBUG_QOS(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_QOS, f, ## a)
@@ -6563,8 +6563,8 @@
  
  #ifndef WIRELESS_SPY
 diff -up linux-2.6.24.noarch/include/net/mac80211.h.orig linux-2.6.24.noarch/include/net/mac80211.h
---- linux-2.6.24.noarch/include/net/mac80211.h.orig	2008-04-01 20:38:39.000000000 -0400
-+++ linux-2.6.24.noarch/include/net/mac80211.h	2008-04-01 20:48:58.000000000 -0400
+--- linux-2.6.24.noarch/include/net/mac80211.h.orig	2008-04-07 23:22:04.000000000 -0400
++++ linux-2.6.24.noarch/include/net/mac80211.h	2008-04-07 23:33:46.000000000 -0400
 @@ -38,7 +38,11 @@
   * called in hardware interrupt context. The low-level driver must not call any
   * other functions in hardware interrupt context. If there is a need for such
@@ -7414,7 +7414,7 @@
  #endif /* MAC80211_H */
 diff -up linux-2.6.24.noarch/include/net/ieee80211softmac.h.orig linux-2.6.24.noarch/include/net/ieee80211softmac.h
 --- linux-2.6.24.noarch/include/net/ieee80211softmac.h.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/include/net/ieee80211softmac.h	2008-04-01 20:48:58.000000000 -0400
++++ linux-2.6.24.noarch/include/net/ieee80211softmac.h	2008-04-07 23:33:46.000000000 -0400
 @@ -1,373 +0,0 @@
 -/*
 - * ieee80211softmac.h - public interface to the softmac
@@ -7791,7 +7791,7 @@
 -#endif /* IEEE80211SOFTMAC_H_ */
 diff -up linux-2.6.24.noarch/include/net/ieee80211softmac_wx.h.orig linux-2.6.24.noarch/include/net/ieee80211softmac_wx.h
 --- linux-2.6.24.noarch/include/net/ieee80211softmac_wx.h.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/include/net/ieee80211softmac_wx.h	2008-04-01 20:48:58.000000000 -0400
++++ linux-2.6.24.noarch/include/net/ieee80211softmac_wx.h	2008-04-07 23:33:46.000000000 -0400
 @@ -1,99 +0,0 @@
 -/*
 - * This file contains the prototypes for the wireless extension
@@ -7893,8 +7893,8 @@
 -			     char *extra);
 -#endif /* _IEEE80211SOFTMAC_WX */
 diff -up linux-2.6.24.noarch/MAINTAINERS.orig linux-2.6.24.noarch/MAINTAINERS
---- linux-2.6.24.noarch/MAINTAINERS.orig	2008-04-01 20:38:04.000000000 -0400
-+++ linux-2.6.24.noarch/MAINTAINERS	2008-04-01 20:48:58.000000000 -0400
+--- linux-2.6.24.noarch/MAINTAINERS.orig	2008-04-07 23:20:57.000000000 -0400
++++ linux-2.6.24.noarch/MAINTAINERS	2008-04-07 23:33:47.000000000 -0400
 @@ -840,15 +840,6 @@ L:	linux-wireless at vger.kernel.org
  W:	http://linuxwireless.org/en/users/Drivers/b43
  S:	Maintained
@@ -7926,7 +7926,7 @@
  M:	mingo at redhat.com
 diff -up linux-2.6.24.noarch/net/ieee80211/Makefile.orig linux-2.6.24.noarch/net/ieee80211/Makefile
 --- linux-2.6.24.noarch/net/ieee80211/Makefile.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/net/ieee80211/Makefile	2008-04-01 20:48:58.000000000 -0400
++++ linux-2.6.24.noarch/net/ieee80211/Makefile	2008-04-07 23:33:47.000000000 -0400
 @@ -10,4 +10,3 @@ ieee80211-objs := \
  	ieee80211_wx.o \
  	ieee80211_geo.o
@@ -7934,7 +7934,7 @@
 -obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/
 diff -up linux-2.6.24.noarch/net/ieee80211/softmac/Makefile.orig linux-2.6.24.noarch/net/ieee80211/softmac/Makefile
 --- linux-2.6.24.noarch/net/ieee80211/softmac/Makefile.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/net/ieee80211/softmac/Makefile	2008-04-01 20:48:58.000000000 -0400
++++ linux-2.6.24.noarch/net/ieee80211/softmac/Makefile	2008-04-07 23:33:47.000000000 -0400
 @@ -1,9 +0,0 @@
 -obj-$(CONFIG_IEEE80211_SOFTMAC) += ieee80211softmac.o
 -ieee80211softmac-objs := \
@@ -7947,7 +7947,7 @@
 -			ieee80211softmac_event.o
 diff -up linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c
 --- linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2008-04-01 20:48:58.000000000 -0400
++++ linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2008-04-07 23:33:47.000000000 -0400
 @@ -1,489 +0,0 @@
 -/*
 - * This file contains the softmac's association logic.
@@ -8439,8 +8439,8 @@
 -	return 0;
 -}
 diff -up linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_io.c.orig linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_io.c
---- linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_io.c.orig	2008-04-01 20:38:40.000000000 -0400
-+++ linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_io.c	2008-04-01 20:48:58.000000000 -0400
+--- linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_io.c.orig	2008-04-07 23:22:07.000000000 -0400
++++ linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_io.c	2008-04-07 23:33:47.000000000 -0400
 @@ -1,488 +0,0 @@
 -/*
 - * Some parts based on code from net80211
@@ -8932,7 +8932,7 @@
 -
 diff -up linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c.orig linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c
 --- linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c	2008-04-01 20:48:58.000000000 -0400
++++ linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c	2008-04-07 23:33:47.000000000 -0400
[...2531 lines suppressed...]
  	err = ieee80211_register_hw(dev);
  	if (err) {
 diff -up linux-2.6.24.noarch/drivers/ssb/Makefile.orig linux-2.6.24.noarch/drivers/ssb/Makefile
---- linux-2.6.24.noarch/drivers/ssb/Makefile.orig	2008-04-01 20:38:33.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/Makefile	2008-04-01 20:48:59.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/Makefile.orig	2008-04-07 23:21:44.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/Makefile	2008-04-07 23:33:47.000000000 -0400
 @@ -1,6 +1,7 @@
  # core
  ssb-y					+= main.o scan.o
@@ -93204,8 +93199,8 @@
  # b43 pci-ssb-bridge driver
  # Not strictly a part of SSB, but kept here for convenience
 diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c
---- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig	2008-04-01 20:38:33.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c	2008-04-01 20:48:59.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig	2008-04-07 23:21:44.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c	2008-04-07 23:33:47.000000000 -0400
 @@ -3,7 +3,7 @@
   * PCMCIA-Hostbus related functions
   *
@@ -93878,8 +93873,8 @@
 +	return err;
  }
 diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c
---- linux-2.6.24.noarch/drivers/ssb/main.c.orig	2008-04-01 20:38:33.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/main.c	2008-04-01 20:48:59.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/main.c.orig	2008-04-07 23:32:00.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/main.c	2008-04-07 23:33:47.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/io.h>
  #include <linux/ssb/ssb.h>
@@ -93992,7 +93987,7 @@
  err_pci_exit:
  	ssb_pci_exit(bus);
  err_unmap:
-@@ -1153,7 +1210,14 @@ static int __init ssb_modinit(void)
+@@ -1159,7 +1216,14 @@ static int __init ssb_modinit(void)
  	err = b43_pci_ssb_bridge_init();
  	if (err) {
  		ssb_printk(KERN_ERR "Broadcom 43xx PCI-SSB-bridge "
@@ -94008,7 +94003,7 @@
  		/* don't fail SSB init because of this */
  		err = 0;
  	}
-@@ -1167,6 +1231,7 @@ fs_initcall(ssb_modinit);
+@@ -1173,6 +1237,7 @@ fs_initcall(ssb_modinit);
  
  static void __exit ssb_modexit(void)
  {
@@ -94018,7 +94013,7 @@
  }
 diff -up linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c
 --- linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c	2008-04-01 20:48:59.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c	2008-04-07 23:33:47.000000000 -0400
 @@ -209,6 +209,7 @@ void ssb_mipscore_init(struct ssb_mipsco
  			/* fallthrough */
  		case SSB_DEV_PCI:
@@ -94028,8 +94023,8 @@
  		case SSB_DEV_USB20_HOST:
  			/* These devices get their own IRQ line if available, the rest goes on IRQ0 */
 diff -up linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig linux-2.6.24.noarch/drivers/ssb/ssb_private.h
---- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig	2008-04-01 20:38:33.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h	2008-04-01 20:48:59.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig	2008-04-07 23:21:44.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h	2008-04-07 23:33:47.000000000 -0400
 @@ -81,6 +81,7 @@ extern int ssb_pcmcia_switch_segment(str
  				     u8 seg);
  extern int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
@@ -94076,8 +94071,8 @@
  /* b43_pci_bridge.c */
  #ifdef CONFIG_SSB_B43_PCI_BRIDGE
 diff -up /dev/null linux-2.6.24.noarch/drivers/ssb/driver_gige.c
---- /dev/null	2008-04-01 10:36:34.721293558 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_gige.c	2008-04-01 20:48:59.000000000 -0400
+--- /dev/null	2008-04-07 22:07:49.954007376 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_gige.c	2008-04-07 23:33:47.000000000 -0400
 @@ -0,0 +1,294 @@
 +/*
 + * Sonics Silicon Backplane
@@ -94374,8 +94369,8 @@
 +	return ssb_driver_register(&ssb_gige_driver);
 +}
 diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c
---- linux-2.6.24.noarch/drivers/ssb/pci.c.orig	2008-04-01 20:38:33.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/pci.c	2008-04-01 20:48:59.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig	2008-04-07 23:21:44.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/pci.c	2008-04-07 23:33:47.000000000 -0400
 @@ -227,7 +227,7 @@ static u8 ssb_sprom_crc(const u16 *sprom
  	return crc;
  }
@@ -94592,8 +94587,8 @@
  	if (err)
  		goto out;
 diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c
---- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig	2008-04-01 20:38:33.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c	2008-04-01 20:48:59.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig	2008-04-07 23:21:44.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c	2008-04-07 23:33:47.000000000 -0400
 @@ -353,6 +353,16 @@ void ssb_chipco_watchdog_timer_set(struc
  	chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
  }
@@ -94612,8 +94607,8 @@
  {
  	return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask;
 diff -up linux-2.6.24.noarch/drivers/ssb/Kconfig.orig linux-2.6.24.noarch/drivers/ssb/Kconfig
---- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig	2008-04-01 20:38:33.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/Kconfig	2008-04-01 20:48:59.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig	2008-04-07 23:21:44.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/Kconfig	2008-04-07 23:33:47.000000000 -0400
 @@ -20,6 +20,10 @@ config SSB
  
  	  If unsure, say N.
@@ -94656,8 +94651,8 @@
 +
  endmenu
 diff -up linux-2.6.24.noarch/drivers/ssb/embedded.c.orig linux-2.6.24.noarch/drivers/ssb/embedded.c
---- linux-2.6.24.noarch/drivers/ssb/embedded.c.orig	2008-04-01 20:38:33.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/embedded.c	2008-04-01 20:48:59.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/embedded.c.orig	2008-04-07 23:21:44.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/embedded.c	2008-04-07 23:33:47.000000000 -0400
 @@ -10,6 +10,9 @@
  
  #include <linux/ssb/ssb.h>
@@ -94760,8 +94755,8 @@
 +	return -ENODEV;
 +}
 diff -up linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c
---- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig	2008-04-01 20:38:33.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c	2008-04-01 20:48:59.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig	2008-04-07 23:21:44.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c	2008-04-07 23:33:47.000000000 -0400
 @@ -60,77 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
  /* Core to access the external PCI config space. Can only have one. */
  static struct ssb_pcicore *extpci_core;
@@ -94937,8 +94932,8 @@
  {
  	u32 val;
 diff -up /dev/null linux-2.6.24.noarch/drivers/ssb/sprom.c
---- /dev/null	2008-04-01 10:36:34.721293558 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/sprom.c	2008-04-01 20:48:59.000000000 -0400
+--- /dev/null	2008-04-07 22:07:49.954007376 -0400
++++ linux-2.6.24.noarch/drivers/ssb/sprom.c	2008-04-07 23:33:47.000000000 -0400
 @@ -0,0 +1,133 @@
 +/*
 + * Sonics Silicon Backplane
@@ -95074,8 +95069,8 @@
 +	return err ? err : count;
 +}
 diff -up linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt
---- linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig	2008-04-01 20:38:03.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt	2008-04-01 20:48:59.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig	2008-04-07 23:20:56.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt	2008-04-07 23:33:47.000000000 -0400
 @@ -80,7 +80,7 @@ once you enable the radio, will depend o
  e.g. With the BCM4318 on the Acer Aspire 5020 series:
  
@@ -95087,7 +95082,7 @@
  acer-wmi come with built-in wireless. However, should you feel so inclined to
 diff -up linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt
 --- linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt	2008-04-01 20:48:59.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt	2008-04-07 23:33:47.000000000 -0400
 @@ -1,89 +0,0 @@
 -
 -			BCM43xx Linux Driver Project
@@ -95179,8 +95174,8 @@
 -and CONFIG_IEEE80211_SOFTMAC_DEBUG. The log information provided is
 -essential for solving any problems.
 diff -up /dev/null linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl
---- /dev/null	2008-04-01 10:36:34.721293558 -0400
-+++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl	2008-04-01 20:48:59.000000000 -0400
+--- /dev/null	2008-04-07 22:07:49.954007376 -0400
++++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl	2008-04-07 23:33:47.000000000 -0400
 @@ -0,0 +1,335 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -95518,8 +95513,8 @@
 +  </part>
 +</book>
 diff -up linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig linux-2.6.24.noarch/Documentation/DocBook/Makefile
---- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig	2008-04-01 20:48:01.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/DocBook/Makefile	2008-04-01 20:48:59.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig	2008-04-07 23:32:00.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/DocBook/Makefile	2008-04-07 23:33:47.000000000 -0400
 @@ -11,7 +11,8 @@ DOCBOOKS := wanbook.xml z8530book.xml mc
  	    procfs-guide.xml writing_usb_driver.xml networking.xml \
  	    kernel-api.xml filesystems.xml lsm.xml usb.xml \
@@ -95531,8 +95526,8 @@
  ###
  # The build process is as follows (targets):
 diff -up linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt
---- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig	2008-04-01 20:38:03.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt	2008-04-01 20:48:59.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig	2008-04-07 23:20:56.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt	2008-04-07 23:33:47.000000000 -0400
 @@ -230,33 +230,6 @@ Who:	Jean Delvare <khali at linux-fr.org>
  
  ---------------------------

linux-2.6-wireless.patch:

Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- linux-2.6-wireless.patch	2 Apr 2008 01:21:33 -0000	1.32
+++ linux-2.6-wireless.patch	8 Apr 2008 03:38:38 -0000	1.33
@@ -1,279 +1,130 @@
-commit d43c7b37ad787173d08683f05eadeea0398fefdf
-Author: Vladimir Koutny <vlado at work.ksp.sk>
-Date:   Mon Mar 31 17:05:03 2008 +0200
+commit 16f2e85d3151efa643879fa5aa87c9d77d60f57e
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date:   Mon Apr 7 14:35:46 2008 +0200
 
-    mac80211: correct use_short_preamble handling
+    nl80211: fix STA AID bug
     
-    ERP IE bit for preamble mode is 0 for short and 1 for long, not the other
-    way around. This fixes the value reported to the driver via
-    bss_conf->use_short_preamble field.
+    This fixes the STA AID setting and actually makes hostapd/mac80211
+    work properly in presence of power-saving stations.
     
-    Signed-off-by: Vladimir Koutny <vlado at ksp.sk>
+    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit e645890115004fa6c4dd1f9541bb834970c8bcae
-Author: Michael Buesch <mb at bu3sch.de>
-Date:   Fri Mar 28 11:48:53 2008 +0100
+commit 881400a20c3551e90eed1062cf0387fa686a2fd0
+Author: Stefano Brivio <stefano.brivio at polimi.it>
+Date:   Sun Apr 6 17:05:07 2008 +0200
 
-    b43: Fix PCMCIA IRQ routing
+    b43legacy: fix bcm4303 crash
     
-    This fixes the IRQ routing on PCMCIA devices.
-    With this patch the card will finally be able to receive IRQs.
+    This fixes an hard crash which happened upon driver loading on bcm4303 rev.
+    2 devices.
     
-    Signed-off-by: Michael Buesch <mb at bu3sch.de>
+    Signed-off-by: Stefano Brivio <stefano.brivio at polimi.it>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 539e6f8cffe9299fbf813ad574535b90ac370031
-Author: Michael Buesch <mb at bu3sch.de>
-Date:   Fri Mar 28 11:46:58 2008 +0100
+commit 7981a35ed0f64ca49b1a0c0acecbc9b644a8a2e3
+Author: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
+Date:   Fri Apr 4 14:32:01 2008 -0700
 
-    b43: Add DMA mapping failure messages
+    iwlwifi: fix n-band association problem
     
-    This adds messages for some DMA mapping failures.
-    These are useful for debugging DMA address problems, as they appear
-    on x86_64 machines with IOMMU enabled.
+    This patch enables the IWL4965_HT flag (n-band) in Kconfig.
+    Removed the "depends on n" from Kconfig for config IWL4965_HT
     
-    Signed-off-by: Michael Buesch <mb at bu3sch.de>
+    Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
+    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 64f851e410ae37a0990212ae34f0c96b641478f7
-Author: Jan Niehusmann <jan at gondor.com>
-Date:   Sun Mar 23 20:23:56 2008 +0100
+commit 3f2eeac97952b262f2b904c6150a9879777995eb
+Author: Daniel Drake <dsd at gentoo.org>
+Date:   Wed Apr 2 20:33:54 2008 +0100
 
-    mac80211: trigger ieee80211_sta_work after opening interface
+    ipw2200: set MAC address on radiotap interface
     
-    ieee80211_sta_work is disabled while network interface
-    is down. Therefore, if you configure wireless parameters
-    before bringing the interface up, these configurations are
-    not yet effective and association fails.
+    Commit bada339ba24dee9e143bfb42e1dc61f146619846 enforces that all
+    interfaces have a valid MAC address before they are brought up.
     
-    A workaround from userspace is calling a command like
-    'iwconfig wlan0 ap any' after the interface is brought up.
+    ipw2200 does not assign a MAC address to it's radiotap interface, meaning
+    that the radiotap interface cannot be brought up in 2.6.24.
+    https://bugs.gentoo.org/show_bug.cgi?id=215714
     
-    To fix this behaviour, trigger execution of ieee80211_sta_work from
-    ieee80211_open when in STA or IBSS mode.
+    Fix this by copying the MAC address from the real interface.
     
-    Signed-off-by: Jan Niehusmann <jan at gondor.com>
+    Signed-off-by: Daniel Drake <dsd at gentoo.org>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 3e05e6703fb663fb8a394615d16c3a93cbef001e
-Author: Ivo van Doorn <ivdoorn at gmail.com>
-Date:   Thu Mar 27 17:15:24 2008 +0100
-
-    rt2x00: Ignore set_state(STATE_SLEEP) failure
-    
-    Some hardware never seem to accept the "goto sleep" command, since the legacy
-    drivers don't have suspend and resume handlers the entire code for it was
-    basically a educated guess (based on the "enable radio" code).
-    This patch will only print a warning when the "goto sleep" command fails, and
-    just continues as usual. Perhaps that means the device will not reach a sleep
-    state and consumes more power then it should, but it is equally possible it
-    simply needs some seconds longer to sleep. Anyway, by making the command
-    non-fatal it will not block the rest of the suspend procedure.
-    
-    Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 8def53bc1ff4686bd24b3c274a4871c9ae33c27c
-Author: Julia Lawall <julia at diku.dk>
-Date:   Tue Mar 4 14:58:59 2008 -0800
-
-    drivers/net/wireless/iwlwifi/iwl-4965.c: correct use of ! and &
-    
-    In commit e6bafba5b4765a5a252f1b8d31cbf6d2459da337, a bug was fixed that
-    involved converting !x & y to !(x & y).  The code below shows the same
-    pattern, and thus should perhaps be fixed in the same way.
-    
-    This is not tested and clearly changes the semantics, so it is only
-    something to consider.
-    
-    The semantic patch that makes this change is as follows:
-    (http://www.emn.fr/x-info/coccinelle/)
-    
-    // <smpl>
-    @@ expression E1,E2; @@
-    (
-      !E1 & !E2
-    |
-    - !E1 & E2
-    + !(E1 & E2)
-    )
-    // </smpl>
-    
-    Signed-off-by: Julia Lawall <julia at diku.dk>
-    Cc: Tomas Winkler <tomas.winkler at intel.com>
-    Cc: Guy Cohen <guy.cohen at intel.com>
-    Cc: Reinette Chatre <reinette.chatre at intel.com>
-    Cc: Zhu Yi <yi.zhu at intel.com>
-    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 9cef555bcc6a5a7c1a5bb7728fd96bc59fa1b96a
+commit 877cb0d4af2658beb5f89d38ae51968782f62fad
 Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
-Date:   Wed Mar 19 15:24:21 2008 +0100
+Date:   Wed Apr 2 16:34:51 2008 +0200
 
-    libertas: fix spinlock recursion bug
-    
-    This fixes a bug detected by CONFIG_DEBUG_SPINLOCK:
+    libertas: fix mode initialization problem
     
-    if_cs_get_int_status() is only called from lbs_thread(), via
-    priv->hw_get_int_status. However, lbs_thread() has already taken the
-    priv->driver_lock. So it's a fault to take the same lock again here.
+    After moving lbs_find_best_network_ssid() from scan.c to assoc.c gcc was
+    able to deduce that new_mode might stay uninitialized.
     
     Signed-off-by: Holger Schurig <hs4233 at mail.mn-solutions.de>
     Acked-by: Dan Williams <dcbw at redhat.com>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-diff -up linux-2.6.24.noarch/net/mac80211/ieee80211.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211.c
---- linux-2.6.24.noarch/net/mac80211/ieee80211.c.orig	2008-04-01 20:39:01.000000000 -0400
-+++ linux-2.6.24.noarch/net/mac80211/ieee80211.c	2008-04-01 20:41:26.000000000 -0400
-@@ -375,6 +375,18 @@ static int ieee80211_open(struct net_dev
- 	if (need_hw_reconfig)
- 		ieee80211_hw_config(local);
+diff -up linux-2.6.24.noarch/net/wireless/nl80211.c.orig linux-2.6.24.noarch/net/wireless/nl80211.c
+--- linux-2.6.24.noarch/net/wireless/nl80211.c.orig	2008-04-07 23:22:10.000000000 -0400
++++ linux-2.6.24.noarch/net/wireless/nl80211.c	2008-04-07 23:27:24.000000000 -0400
+@@ -945,7 +945,7 @@ static int nl80211_new_station(struct sk
+ 		nla_len(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]);
+ 	params.listen_interval =
+ 		nla_get_u16(info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL]);
+-	params.listen_interval = nla_get_u16(info->attrs[NL80211_ATTR_STA_AID]);
++	params.aid = nla_get_u16(info->attrs[NL80211_ATTR_STA_AID]);
+ 
+ 	if (parse_station_flags(info->attrs[NL80211_ATTR_STA_FLAGS],
+ 				&params.station_flags))
+diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c
+--- linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c.orig	2008-04-07 23:21:35.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c	2008-04-07 23:27:24.000000000 -0400
+@@ -541,7 +541,7 @@ void lbs_association_worker(struct work_
+ 	}
+ 
+ 	if (find_any_ssid) {
+-		u8 new_mode;
++		u8 new_mode = assoc_req->mode;
+ 
+ 		ret = lbs_find_best_network_ssid(priv, assoc_req->ssid,
+ 				&assoc_req->ssid_len, assoc_req->mode, &new_mode);
+diff -up linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c.orig linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c
+--- linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c.orig	2008-04-07 23:21:34.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c	2008-04-07 23:27:24.000000000 -0400
+@@ -11576,6 +11576,7 @@ static int ipw_prom_alloc(struct ipw_pri
+ 	priv->prom_priv->priv = priv;
+ 
+ 	strcpy(priv->prom_net_dev->name, "rtap%d");
++	memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
+ 
+ 	priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
+ 	priv->prom_net_dev->open = ipw_prom_open;
+diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig
+--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig	2008-04-07 23:21:34.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig	2008-04-07 23:27:24.000000000 -0400
+@@ -35,7 +35,6 @@ config IWL4965_HT
+ 	bool "Enable 802.11n HT features in iwl4965 driver"
+ 	depends on EXPERIMENTAL
+ 	depends on IWL4965 && IWL4965_QOS
+-	depends on n
+ 	---help---
+ 	  This option enables IEEE 802.11n High Throughput features
+ 	  for the iwl4965 driver.
+diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c
+--- linux-2.6.24.noarch/drivers/ssb/main.c.orig	2008-04-07 23:21:44.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/main.c	2008-04-07 23:27:24.000000000 -0400
+@@ -1044,6 +1044,12 @@ int ssb_bus_may_powerdown(struct ssb_bus
+ 		goto out;
  
-+	/*
-+	 * ieee80211_sta_work is disabled while network interface
-+	 * is down. Therefore, some configuration changes may not
-+	 * yet be effective. Trigger execution of ieee80211_sta_work
-+	 * to fix this.
-+	 */
-+	if(sdata->vif.type == IEEE80211_IF_TYPE_STA ||
-+	   sdata->vif.type == IEEE80211_IF_TYPE_IBSS) {
-+		struct ieee80211_if_sta *ifsta = &sdata->u.sta;
-+		queue_work(local->hw.workqueue, &ifsta->work);
-+	}
+ 	cc = &bus->chipco;
 +
- 	netif_start_queue(dev);
- 
- 	return 0;
-diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c
---- linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig	2008-04-01 20:39:01.000000000 -0400
-+++ linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c	2008-04-01 20:41:26.000000000 -0400
-@@ -360,7 +360,7 @@ static u32 ieee80211_handle_erp_ie(struc
- 	struct ieee80211_bss_conf *bss_conf = &sdata->bss_conf;
- 	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
- 	bool use_protection = (erp_value & WLAN_ERP_USE_PROTECTION) != 0;
--	bool preamble_mode = (erp_value & WLAN_ERP_BARKER_PREAMBLE) != 0;
-+	bool use_short_preamble = (erp_value & WLAN_ERP_BARKER_PREAMBLE) == 0;
- 	DECLARE_MAC_BUF(mac);
- 	u32 changed = 0;
- 
-@@ -376,16 +376,15 @@ static u32 ieee80211_handle_erp_ie(struc
- 		changed |= BSS_CHANGED_ERP_CTS_PROT;
- 	}
- 
--	if (preamble_mode != bss_conf->use_short_preamble) {
-+	if (use_short_preamble != bss_conf->use_short_preamble) {
- 		if (net_ratelimit()) {
- 			printk(KERN_DEBUG "%s: switched to %s barker preamble"
- 			       " (BSSID=%s)\n",
- 			       sdata->dev->name,
--			       (preamble_mode == WLAN_ERP_PREAMBLE_SHORT) ?
--					"short" : "long",
-+			       use_short_preamble ? "short" : "long",
- 			       print_mac(mac, ifsta->bssid));
- 		}
--		bss_conf->use_short_preamble = preamble_mode;
-+		bss_conf->use_short_preamble = use_short_preamble;
- 		changed |= BSS_CHANGED_ERP_PREAMBLE;
- 	}
- 
-diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/pcmcia.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43/pcmcia.c
---- linux-2.6.24.noarch/drivers/net/wireless/b43/pcmcia.c.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/drivers/net/wireless/b43/pcmcia.c	2008-04-01 20:41:26.000000000 -0400
-@@ -91,6 +91,8 @@ static int __devinit b43_pcmcia_probe(st
- 
- 	dev->conf.ConfigBase = parse.config.base;
- 	dev->conf.Present = parse.config.rmask[0];
-+	dev->conf.Attributes = CONF_ENABLE_IRQ;
-+	dev->conf.IntType = INT_MEMORY_AND_IO;
- 
- 	dev->io.BasePort2 = 0;
- 	dev->io.NumPorts2 = 0;
-@@ -112,8 +114,8 @@ static int __devinit b43_pcmcia_probe(st
- 	if (res != CS_SUCCESS)
- 		goto err_disable;
- 
--	dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FIRST_SHARED;
--	dev->irq.IRQInfo1 = IRQ_LEVEL_ID | IRQ_SHARE_ID;
-+	dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-+	dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
- 	dev->irq.Handler = NULL; /* The handler is registered later. */
- 	dev->irq.Instance = NULL;
- 	res = pcmcia_request_irq(dev, &dev->irq);
-diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/dma.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43/dma.c
---- linux-2.6.24.noarch/drivers/net/wireless/b43/dma.c.orig	2008-04-01 20:39:01.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/b43/dma.c	2008-04-01 20:41:26.000000000 -0400
-@@ -574,6 +574,7 @@ static int setup_rx_descbuffer(struct b4
- 	}
- 
- 	if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) {
-+		b43err(ring->dev->wl, "RX DMA buffer allocation failed\n");
- 		dev_kfree_skb_any(skb);
- 		return -EIO;
- 	}
-@@ -829,8 +830,12 @@ struct b43_dmaring *b43_setup_dmaring(st
- 						  DMA_TO_DEVICE);
- 
- 			if (b43_dma_mapping_error(ring, dma_test,
--						  b43_txhdr_size(dev), 1))
-+						  b43_txhdr_size(dev), 1)) {
++	if (!cc->dev)
++		goto out;
++	if (cc->dev->id.revision < 5)
++		goto out;
 +
-+				b43err(dev->wl,
-+				       "TXHDR DMA allocation failed\n");
- 				goto err_kfree_txhdr_cache;
-+			}
- 		}
- 
- 		dma_unmap_single(dev->dev->dev,
-diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/if_cs.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/if_cs.c
---- linux-2.6.24.noarch/drivers/net/wireless/libertas/if_cs.c.orig	2008-04-01 20:40:36.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/if_cs.c	2008-04-01 20:40:41.000000000 -0400
-@@ -677,9 +677,7 @@ sbi_get_int_status_exit:
- 
- 	/* Card has a command result for us */
- 	if (*ireg & IF_CS_C_S_CMD_UPLD_RDY) {
--		spin_lock(&priv->driver_lock);
- 		ret = if_cs_receive_cmdres(priv, priv->upld_buf, &priv->upld_len);
--		spin_unlock(&priv->driver_lock);
- 		if (ret < 0)
- 			lbs_pr_err("could not receive cmd from card\n");
- 	}
-diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig	2008-04-01 20:40:36.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c	2008-04-01 20:40:41.000000000 -0400
-@@ -4602,7 +4602,7 @@ static u8 iwl4965_is_fat_tx_allowed(stru
- 
- 	if (sta_ht_inf) {
- 		if ((!sta_ht_inf->ht_supported) ||
--		   (!sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH))
-+		   (!(sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH)))
- 			return 0;
- 	}
- 
-diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c
---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig	2008-04-01 20:40:36.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c	2008-04-01 20:40:41.000000000 -0400
-@@ -1246,11 +1246,20 @@ int rt2x00lib_suspend(struct rt2x00_dev 
- 
- exit:
- 	/*
--	 * Set device mode to sleep for power management.
-+	 * Set device mode to sleep for power management,
-+	 * on some hardware this call seems to consistently fail.
-+	 * From the specifications it is hard to tell why it fails,
-+	 * and if this is a "bad thing".
-+	 * Overall it is safe to just ignore the failure and
-+	 * continue suspending. The only downside is that the
-+	 * device will not be in optimal power save mode, but with
-+	 * the radio and the other components already disabled the
-+	 * device is as good as disabled.
- 	 */
- 	retval = rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_SLEEP);
- 	if (retval)
--		return retval;
-+		WARNING(rt2x00dev, "Device failed to enter sleep state, "
-+			"continue suspending.\n");
- 
- 	return 0;
- }
+ 	ssb_chipco_set_clockmode(cc, SSB_CLKMODE_SLOW);
+ 	err = ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 0);
+ 	if (err)

More information about the fedora-extras-commits mailing list