rpms/kernel/devel config-generic, 1.89, 1.90 kernel.spec, 1.554, 1.555 linux-2.6-wireless-pending.patch, 1.40, 1.41 linux-2.6-wireless.patch, 1.30, 1.31 linux-2.6-cfg80211-fixup.patch, 1.1, NONE linux-2.6-iwlwifi-sband-registration.patch, 1.1, NONE linux-2.6-mac80211-enc-off.patch, 1.1, NONE linux-2.6-prism54-mutex-thinko.patch, 1.1, NONE
John W. Linville (linville)
fedora-extras-commits at redhat.com
Fri Mar 28 19:55:44 UTC 2008
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9514
Modified Files:
config-generic kernel.spec linux-2.6-wireless-pending.patch
linux-2.6-wireless.patch
Removed Files:
linux-2.6-cfg80211-fixup.patch
linux-2.6-iwlwifi-sband-registration.patch
linux-2.6-mac80211-enc-off.patch
linux-2.6-prism54-mutex-thinko.patch
Log Message:
wireless fixes/updates from 2008-03-27
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- config-generic 28 Mar 2008 15:52:55 -0000 1.89
+++ config-generic 28 Mar 2008 19:54:38 -0000 1.90
@@ -1300,6 +1300,7 @@
CONFIG_LIBERTAS_CS=m
CONFIG_LIBERTAS_SDIO=m
CONFIG_LIBERTAS_DEBUG=y
+CONFIG_IWLWIFI_LEDS=y
CONFIG_IWL4965=m
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEBUGFS=y
@@ -1307,10 +1308,12 @@
CONFIG_IWL4965_SPECTRUM_MEASUREMENT=y
CONFIG_IWL4965_QOS=y
CONFIG_IWL4965_HT=y
+CONFIG_IWL4965_LEDS=y
CONFIG_IWL3945=m
CONFIG_IWL3945_DEBUG=y
CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
CONFIG_IWL3945_QOS=y
+CONFIG_IWL3945_LEDS=y
CONFIG_NORTEL_HERMES=m
CONFIG_P54_COMMON=m
CONFIG_P54_USB=m
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -r1.554 -r1.555
--- kernel.spec 28 Mar 2008 19:11:02 -0000 1.554
+++ kernel.spec 28 Mar 2008 19:54:38 -0000 1.555
@@ -607,10 +607,6 @@
Patch680: linux-2.6-wireless.patch
Patch681: linux-2.6-wireless-pending.patch
-Patch682: linux-2.6-iwlwifi-sband-registration.patch
-Patch683: linux-2.6-mac80211-enc-off.patch
-Patch684: linux-2.6-prism54-mutex-thinko.patch
-Patch685: linux-2.6-cfg80211-fixup.patch
Patch690: linux-2.6-at76.patch
Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
@@ -1103,13 +1099,9 @@
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
-ApplyPatch linux-2.6-iwlwifi-sband-registration.patch
-ApplyPatch linux-2.6-mac80211-enc-off.patch
-ApplyPatch linux-2.6-prism54-mutex-thinko.patch
-ApplyPatch linux-2.6-cfg80211-fixup.patch
# Add misc wireless bits from upstream wireless tree
ApplyPatch linux-2.6-at76.patch
@@ -1739,6 +1731,22 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
%changelog
+* Fri Mar 28 2008 John W. Linville <linville at redhat.com>
+- libertas: fix spinlock recursion bug
+- rt2x00: Ignore set_state(STATE_SLEEP) failure
+- iwlwifi: allow a default callback for ASYNC host commands
+- libertas: kill useless #define LBS_MONITOR_OFF 0
+- libertas: remove CMD_802_11_PWR_CFG
+- libertas: the compact flash driver is no longer experimental
+- libertas: reduce debug output
+- mac80211: reorder fields to make some structures smaller
+- iwlwifi: Add led support
+- mac80211: fix wrong Rx A-MPDU control via debugfs
+- mac80211: A-MPDU MLME use dynamic allocation
+- iwlwifi: rename iwl-4965-io.h to iwl-io.h
+- iwlwifi: improve NIC i/o debug prints information
+- iwlwifi: iwl_priv - clean up in types of members
+
* Fri Mar 28 2008 Jarod Wilson <jwilson at redhat.com>
- Fix up Requires/Provides for debuginfo bits
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.40 -r 1.41 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- linux-2.6-wireless-pending.patch 26 Mar 2008 20:39:37 -0000 1.40
+++ linux-2.6-wireless-pending.patch 28 Mar 2008 19:54:38 -0000 1.41
@@ -1,3 +1,226 @@
+commit e5225b397308f9eea86327293b73dc88068e0179
+Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
+Date: Wed Mar 26 10:04:44 2008 +0100
+
+ libertas: reduce debug output
+
+ This patch tries to make dmesg logs between different runs easier
+ to compare by
+
+ * removing the jiffies (use CONFIG_PRINTK_TIME if you need
+ timing)
+ * remove the line numbers, they change with each applied patch
+
+ It also changes the deprecated __FUNCTION__ to __func__ to make
+ checkpatch.pl happy.
+
+ 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>
+
+commit 056cdd599d004e36de64c925b8a13f6676451360
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date: Wed Mar 26 23:21:47 2008 +0100
+
+ mac80211: reorder fields to make some structures smaller
+
+ This patch reorders some fields in various structures to have
+ less padding within the structures, making them smaller. It
+ doesn't yet make any type adjustments, but often size_t is used
+ for example for IE lengths which is total overkill since size_t
+ will be 8 bytes long on 64-bit yet the length can at most fill
+ a u8.
+
+ Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 8dd62822ddbf6a9314e9b92a3816c04490c91293
+Author: John W. Linville <linville at tuxdriver.com>
+Date: Wed Mar 26 15:21:33 2008 -0400
+
+ prism54: correct thinko in "prism54: Convert stats_sem in a mutex"
+
+ mutex_trylock has different return code semantics than down_trylock...
+
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit cee24a3e580f1062c8bb8b1692b95014d882bc7d
+Author: Ron Rindjunsky <ron.rindjunsky at intel.com>
+Date: Wed Mar 26 20:36:03 2008 +0200
+
+ mac80211: A-MPDU MLME use dynamic allocation
+
+ This patch alters the A-MPDU MLME in sta_info to use dynamic allocation,
+ thus drastically improving memory usage - from a constant ~2 Kbyte in
+ the previous (static) allocation to a lower limit of ~200 Byte and an upper
+ limit of ~2 Kbyte.
+
+ Signed-off-by: Ron Rindjunsky <ron.rindjunsky at intel.com>
+ Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 6c507cd0400cb51dd2ee251c1b8756b9375a1128
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date: Wed Mar 26 14:14:55 2008 +0100
+
+ cfg80211: don't export ieee80211_get_channel
+
+ This patch makes ieee80211_get_channel a static inline defined in
+ cfg80211's header file which simply calls __ieee80211_get_channel
+ to avoid symbol clashes with the ieee80211 code.
+
+ The problem was pointed out by David Miller, thanks!
+
+ Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+ Cc: David Miller <davem at davemloft.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 7d5796118353cd45e9e301fdf3ff99fdec5390e9
+Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
+Date: Wed Mar 26 13:26:55 2008 +0100
+
+ libertas: the compact flash driver is no longer experimental
+
+ 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>
+
+commit 62436138c83f221943c1f5d9cff41305d3d26ac4
+Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
+Date: Wed Mar 26 09:57:45 2008 +0100
+
+ libertas: remove CMD_802_11_PWR_CFG
+
+ This has nowhere been used. Note: in the firmware manual this was
+ documented as CMD_802_11_PA_CFG. If we ever need it, we can/should
+ re-implement it as a direct command.
+
+ 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>
+
+commit c2b310a73b62f074b0019b940417cafbdbafde41
+Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
+Date: Wed Mar 26 09:57:14 2008 +0100
+
+ libertas: kill useless #define LBS_MONITOR_OFF 0
+
+ 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>
+
+commit 69dc5d9da5c499c23db7b80217023403da103816
+Author: Tomas Winkler <tomas.winkler at intel.com>
+Date: Tue Mar 25 16:33:41 2008 -0700
+
+ iwlwifi: iwl_priv - clean up in types of members
+
+ This patch fix types of is_open and iw_mode members
+ of iwl_priv sturct
+
+ Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+ Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 0472f887e0689fff2dce82c01d40698432965b5a
+Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+Date: Tue Mar 25 16:33:40 2008 -0700
+
+ iwlwifi: allow a default callback for ASYNC host commands
+
+ This patch provides a default callback for ASYNC host commands instead
+ of calling to BUG_ON. Most of the callbacks are now just empty functions
+
+ Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+ Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 24709182754625829e499b5d628affa881d1dba0
+Author: Ron Rindjunsky <ron.rindjunsky at intel.com>
+Date: Tue Mar 25 16:33:39 2008 -0700
+
+ mac80211: fix wrong Rx A-MPDU control via debugfs
+
+ This patch eliminate the use of buf_size as a trigger in favor of a new
+ flag to control Rx A-MPDU sessions through debugfs
+
+ Signed-off-by: Ron Rindjunsky <ron.rindjunsky at intel.com>
+ Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 775ea378fa04f39164f170f308ec467ee4ab6d34
+Author: Tomas Winkler <tomas.winkler at intel.com>
+Date: Tue Mar 25 16:33:38 2008 -0700
+
+ iwlwifi: improve NIC i/o debug prints information
+
+ This patch gives the function's caller name in case NIC
+ access reference count was not used by it.
+
+ Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+ Signed-off-by: Ron Rindjunsky <ron.rindjunsky at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 3395f6e9cf48469d7ee05703cad1502002741c16
+Author: Tomas Winkler <tomas.winkler at intel.com>
+Date: Tue Mar 25 16:33:37 2008 -0700
+
+ iwlwifi: rename iwl-4965-io.h to iwl-io.h
+
+ This patch renames iwl-4965-io.h back to iw-io.h
+ it also remove 4965 from all functions it supplies
+
+ Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+ Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit ab53d8af6772b22d4d68b1bcd74f7a5dba693983
+Author: Mohamed Abbas <mabbas at linux.intel.com>
+Date: Tue Mar 25 16:33:36 2008 -0700
+
+ iwlwifi: Add led support
+
+ This patch add LEDS support to 3965 and 4965 drivers. It is based on
+ led trigger and class. For our drivers we needed to avoid two things.
+ 1- We receive led trigger on/off on each Rx\Tx frame. In our driver
+ we can not call led command like that. In this driver once driver
+ receive a start of traffic it call the led command to start blinking
+ then we count all bytes of Tx and Rx frame, after two second we count the
+ blink rate of last two second then id blink rate changed we call the led
+ commands
+ 2- Since we can call led command very often, we make sure we call the
[...14048 lines suppressed...]
-+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig 2008-03-28 10:30:45.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-03-28 11:55:11.000000000 -0400
@@ -78,8 +78,9 @@ static void max2820_rf_set_channel(struc
struct ieee80211_conf *conf)
{
@@ -87669,8 +91159,8 @@
/* While philips SA2400 drive the PA bias from
diff -up linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.24.noarch/drivers/net/wireless/adm8211.c
---- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-03-26 15:40:50.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-03-28 10:30:43.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-03-28 11:55:11.000000000 -0400
@@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_
{ 0 }
};
@@ -87840,8 +91330,8 @@
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-03-26 15:40:52.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/Makefile 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/Makefile.orig 2008-03-28 10:30:47.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/Makefile 2008-03-28 11:55:11.000000000 -0400
@@ -1,6 +1,7 @@
# core
ssb-y += main.o scan.o
@@ -87859,8 +91349,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-03-26 15:40:52.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-28 10:30:47.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-28 11:55:11.000000000 -0400
@@ -3,7 +3,7 @@
* PCMCIA-Hostbus related functions
*
@@ -88533,8 +92023,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-03-26 15:40:52.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-28 10:30:47.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-28 11:55:11.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/io.h>
#include <linux/ssb/ssb.h>
@@ -88673,7 +92163,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-03-26 15:50:50.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c 2008-03-28 11:55:11.000000000 -0400
@@ -209,6 +209,7 @@ void ssb_mipscore_init(struct ssb_mipsco
/* fallthrough */
case SSB_DEV_PCI:
@@ -88683,8 +92173,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-03-26 15:40:52.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig 2008-03-28 10:30:47.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h 2008-03-28 11:55:11.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,
@@ -88731,8 +92221,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-03-26 10:12:08.710666650 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_gige.c 2008-03-26 15:50:50.000000000 -0400
+--- /dev/null 2008-03-28 08:58:45.220448129 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_gige.c 2008-03-28 11:55:11.000000000 -0400
@@ -0,0 +1,294 @@
+/*
+ * Sonics Silicon Backplane
@@ -89029,8 +92519,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-03-26 15:40:52.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-28 10:30:47.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-28 11:55:11.000000000 -0400
@@ -227,7 +227,7 @@ static u8 ssb_sprom_crc(const u16 *sprom
return crc;
}
@@ -89247,8 +92737,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-03-26 15:40:52.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-28 10:30:47.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-28 11:55:11.000000000 -0400
@@ -353,6 +353,16 @@ void ssb_chipco_watchdog_timer_set(struc
chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
}
@@ -89267,8 +92757,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-03-26 15:40:52.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/Kconfig 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig 2008-03-28 10:30:47.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/Kconfig 2008-03-28 11:55:11.000000000 -0400
@@ -20,6 +20,10 @@ config SSB
If unsure, say N.
@@ -89311,8 +92801,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-03-26 15:40:52.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/embedded.c 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/embedded.c.orig 2008-03-28 10:30:47.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/embedded.c 2008-03-28 11:55:11.000000000 -0400
@@ -10,6 +10,9 @@
#include <linux/ssb/ssb.h>
@@ -89415,8 +92905,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-03-26 15:40:52.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-03-28 10:30:47.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-03-28 11:55:11.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;
@@ -89592,8 +93082,8 @@
{
u32 val;
diff -up /dev/null linux-2.6.24.noarch/drivers/ssb/sprom.c
---- /dev/null 2008-03-26 10:12:08.710666650 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/sprom.c 2008-03-26 15:50:50.000000000 -0400
+--- /dev/null 2008-03-28 08:58:45.220448129 -0400
++++ linux-2.6.24.noarch/drivers/ssb/sprom.c 2008-03-28 11:55:11.000000000 -0400
@@ -0,0 +1,133 @@
+/*
+ * Sonics Silicon Backplane
@@ -89729,8 +93219,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-03-26 15:40:27.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig 2008-03-28 10:30:27.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt 2008-03-28 11:55:11.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:
@@ -89742,7 +93232,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-03-26 15:50:50.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt 2008-03-28 11:55:11.000000000 -0400
@@ -1,89 +0,0 @@
-
- BCM43xx Linux Driver Project
@@ -89834,8 +93324,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-03-26 10:12:08.710666650 -0400
-+++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl 2008-03-26 15:50:50.000000000 -0400
+--- /dev/null 2008-03-28 08:58:45.220448129 -0400
++++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl 2008-03-28 11:55:11.000000000 -0400
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -90173,8 +93663,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-03-26 15:41:09.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/DocBook/Makefile 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig 2008-03-28 11:53:57.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/DocBook/Makefile 2008-03-28 11:55:11.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 \
@@ -90186,8 +93676,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-03-26 15:40:26.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt 2008-03-26 15:50:50.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig 2008-03-28 10:30:27.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt 2008-03-28 11:55:11.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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- linux-2.6-wireless.patch 25 Mar 2008 18:42:30 -0000 1.30
+++ linux-2.6-wireless.patch 28 Mar 2008 19:54:39 -0000 1.31
@@ -1,408 +1,119 @@
-commit 50b48c24c78024e267356b1881bc169556be6184
-Author: Michael Buesch <mb at bu3sch.de>
-Date: Sun Mar 23 01:08:22 2008 +0100
-
- b43: Remove irqs_disabled() sanity checks
-
- Remove all irqs_disabled() sanity checks, as they are not safe on
- a RT-enabled kernel and will trigger bogus warnings.
-
- Signed-off-by: Michael Buesch <mb at bu3sch.de>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit d62146743a31e6c327249bba2b1422cff4d7a50b
-Author: Michael Buesch <mb at bu3sch.de>
-Date: Sat Mar 22 22:04:45 2008 +0100
-
- b43: Fix DMA mapping leakage
-
- This fixes a DMA mapping leakage in the case where we reject a DMA
- buffer because of its address.
-
- Signed-off-by: Michael Buesch <mb at bu3sch.de>
- Cc: Christian Casteyde <casteyde.christian at free.fr>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit e7d51b8c7b0fc99482ce16616f23ee3ebbc43dff
-Author: Reinette Chatre <reinette.chatre at intel.com>
-Date: Fri Mar 21 13:53:41 2008 -0700
-
- iwlwifi: fix __devexit_p points to __devexit functions
-
- The iwlxxxx_pci_remove functions are not needed when drivers are not
- compiled as modules - they can thus be discarded at kernel link time.
- This is already captured by having them as __devexit_p in the pci_driver
- struct - these are supposed to be pointers to __devexit functions, but was not.
- This is now fixed.
-
- This problem was reported by Toralf Forster when testing the compilation of
- 2.6.25-rc6.
-
- Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
- CC: Toralf Forster <toralf.foerster at gmx.de>
- Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit e0bdc6ae87e39d5dd922f294fa2f20219e51fe8c
-Author: Reinette Chatre <reinette.chatre at intel.com>
-Date: Fri Mar 21 13:53:40 2008 -0700
-
- MAINTAINERS: update iwlwifi git url
-
- Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 2bccacf8154922830950089a04aa979f98bd400a
-Author: John W. Linville <linville at tuxdriver.com>
-Date: Thu Mar 20 16:19:04 2008 -0400
-
- arlan: fix warning when PROC_FS=n
-
- drivers/net/wireless/arlan-proc.c:1216: warning: 'arlan_root_table' defined but not used
-
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit fc0f0df940608fd40424f46f2002253dec39146d
-Author: Rick Farrington <rickdic at hotmail.com>
-Date: Tue Mar 18 14:57:49 2008 -0700
-
- iwlwifi: mac start synchronization issue
-
- This patch fixes a synchronization problem on the 4965 and 3945 with the
- mac start callback routine. The problem is that this function exits BEFORE the
- 'xxx_alive_start' has completed. This can lead to a problem if a
- subsequent MAC callback attempts to issue a firmware command.
-
- Signed-off-by: Rick Farrington <rickdic at hotmail.com>
- Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit a0c2e030b91b75e469a1d983de4fbb6497efccc3
-Author: Al Viro <viro at ftp.linux.org.uk>
-Date: Sun Mar 16 22:43:06 2008 +0000
-
- wavelan_cs arm fix
-
- Even when all fields are unsigned char, struct still might have
- alignment > 1. Does so on arm, unless you explicitly say that
- it's packed...
-
- Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit a4eac923319deb80bc9f4d70cc2ed5e014df597d
-Author: Masakazu Mokuno <mokuno at sm.sony.co.jp>
-Date: Sat Mar 15 21:38:29 2008 +0100
-
- rt2x00: Add id for Corega CG-WLUSB2GPX
-
- This adds the id for Corega CG-WLUSB2GPX.
+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: Masakazu Mokuno <mokuno at sm.sony.co.jp>
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 91bf0cf8540d7aa7b65a20db05015f49d2bb92d3
-Author: Pascal Terjan <pterjan at mandriva.com>
-Date: Thu Mar 13 19:13:24 2008 +0100
-
- iwlwifi: fix a typo in Kconfig message
-
- Signed-off-by: Pascal Terjan <pterjan at mandriva.com>
- Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-diff -up linux-2.6.24.noarch/MAINTAINERS.orig linux-2.6.24.noarch/MAINTAINERS
---- linux-2.6.24.noarch/MAINTAINERS.orig 2008-03-24 16:35:48.000000000 -0400
-+++ linux-2.6.24.noarch/MAINTAINERS 2008-03-25 12:57:56.000000000 -0400
-@@ -2110,7 +2110,7 @@ M: reinette.chatre at intel.com
- L: linux-wireless at vger.kernel.org
- L: ipw3945-devel at lists.sourceforge.net
- W: http://intellinuxwireless.org
--T: git git://intellinuxwireless.org/repos/iwlwifi
-+T: git git://git.kernel.org/pub/scm/linux/kernel/git/rchatre/iwlwifi-2.6.git
- S: Supported
-
- IOC3 ETHERNET DRIVER
-diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43/main.c
---- linux-2.6.24.noarch/drivers/net/wireless/b43/main.c.orig 2008-03-24 16:35:43.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/b43/main.c 2008-03-25 12:57:57.000000000 -0400
-@@ -2049,7 +2049,6 @@ void b43_mac_enable(struct b43_wldev *de
- {
- dev->mac_suspended--;
- B43_WARN_ON(dev->mac_suspended < 0);
-- B43_WARN_ON(irqs_disabled());
- if (dev->mac_suspended == 0) {
- b43_write32(dev, B43_MMIO_MACCTL,
- b43_read32(dev, B43_MMIO_MACCTL)
-@@ -2075,7 +2074,6 @@ void b43_mac_suspend(struct b43_wldev *d
- u32 tmp;
-
- might_sleep();
-- B43_WARN_ON(irqs_disabled());
- B43_WARN_ON(dev->mac_suspended < 0);
-
- if (dev->mac_suspended == 0) {
-diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/debugfs.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.24.noarch/drivers/net/wireless/b43/debugfs.c.orig 2008-03-24 16:35:43.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/b43/debugfs.c 2008-03-25 12:57:57.000000000 -0400
-@@ -618,6 +618,7 @@ void b43_debugfs_remove_device(struct b4
- kfree(e);
- }
-
-+/* Called with IRQs disabled. */
- void b43_debugfs_log_txstat(struct b43_wldev *dev,
- const struct b43_txstatus *status)
- {
-@@ -629,8 +630,7 @@ void b43_debugfs_log_txstat(struct b43_w
- if (!e)
- return;
- log = &e->txstatlog;
-- B43_WARN_ON(!irqs_disabled());
-- spin_lock(&log->lock);
-+ spin_lock(&log->lock); /* IRQs are already disabled. */
- i = log->end + 1;
- if (i == B43_NR_LOGGED_TXSTATUS)
- i = 0;
-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-03-24 16:35:43.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/b43/dma.c 2008-03-25 12:57:57.000000000 -0400
-@@ -560,7 +560,7 @@ static int b43_dmacontroller_tx_reset(st
- /* Check if a DMA mapping address is invalid. */
- static bool b43_dma_mapping_error(struct b43_dmaring *ring,
- dma_addr_t addr,
-- size_t buffersize)
-+ size_t buffersize, bool dma_to_device)
- {
- if (unlikely(dma_mapping_error(addr)))
- return 1;
-@@ -568,11 +568,11 @@ static bool b43_dma_mapping_error(struct
- switch (ring->type) {
- case B43_DMA_30BIT:
- if ((u64)addr + buffersize > (1ULL << 30))
-- return 1;
-+ goto address_error;
- break;
- case B43_DMA_32BIT:
- if ((u64)addr + buffersize > (1ULL << 32))
-- return 1;
-+ goto address_error;
- break;
- case B43_DMA_64BIT:
- /* Currently we can't have addresses beyond
-@@ -582,6 +582,12 @@ static bool b43_dma_mapping_error(struct
-
- /* The address is OK. */
- return 0;
-+
-+address_error:
-+ /* We can't support this address. Unmap it again. */
-+ unmap_descbuffer(ring, addr, buffersize, dma_to_device);
-+
-+ return 1;
- }
-
- static int setup_rx_descbuffer(struct b43_dmaring *ring,
-@@ -599,7 +605,7 @@ static int setup_rx_descbuffer(struct b4
- if (unlikely(!skb))
- return -ENOMEM;
- dmaaddr = map_descbuffer(ring, skb->data, ring->rx_buffersize, 0);
-- if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize)) {
-+ if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) {
- /* ugh. try to realloc in zone_dma */
- gfp_flags |= GFP_DMA;
-
-@@ -612,7 +618,7 @@ static int setup_rx_descbuffer(struct b4
- ring->rx_buffersize, 0);
+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
+Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
+Date: Wed Mar 19 15:24:21 2008 +0100
+
+ libertas: fix spinlock recursion bug
+
+ This fixes a bug detected by CONFIG_DEBUG_SPINLOCK:
+
+ 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.
+
+ 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/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-03-28 12:22:08.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/if_cs.c 2008-03-28 15:17:08.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");
}
-
-- if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize)) {
-+ if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) {
- dev_kfree_skb_any(skb);
- return -EIO;
+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-03-28 12:22:07.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2008-03-28 15:17:08.000000000 -0400
+@@ -4589,7 +4589,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;
}
-@@ -852,7 +858,8 @@ struct b43_dmaring *b43_setup_dmaring(st
- b43_txhdr_size(dev),
- DMA_TO_DEVICE);
-
-- if (b43_dma_mapping_error(ring, dma_test, b43_txhdr_size(dev))) {
-+ if (b43_dma_mapping_error(ring, dma_test,
-+ b43_txhdr_size(dev), 1)) {
- /* ugh realloc */
- kfree(ring->txhdr_cache);
- ring->txhdr_cache = kcalloc(nr_slots,
-@@ -867,7 +874,7 @@ struct b43_dmaring *b43_setup_dmaring(st
- DMA_TO_DEVICE);
-
- if (b43_dma_mapping_error(ring, dma_test,
-- b43_txhdr_size(dev)))
-+ b43_txhdr_size(dev), 1))
- goto err_kfree_txhdr_cache;
- }
-
-@@ -1189,7 +1196,7 @@ static int dma_tx_fragment(struct b43_dm
-
- meta_hdr->dmaaddr = map_descbuffer(ring, (unsigned char *)header,
- hdrsize, 1);
-- if (b43_dma_mapping_error(ring, meta_hdr->dmaaddr, hdrsize)) {
-+ if (b43_dma_mapping_error(ring, meta_hdr->dmaaddr, hdrsize, 1)) {
- ring->current_slot = old_top_slot;
- ring->used_slots = old_used_slots;
- return -EIO;
-@@ -1208,7 +1215,7 @@ static int dma_tx_fragment(struct b43_dm
-
- meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
- /* create a bounce buffer in zone_dma on mapping failure. */
-- if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len)) {
-+ if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {
- bounce_skb = __dev_alloc_skb(skb->len, GFP_ATOMIC | GFP_DMA);
- if (!bounce_skb) {
- ring->current_slot = old_top_slot;
-@@ -1222,7 +1229,7 @@ static int dma_tx_fragment(struct b43_dm
- skb = bounce_skb;
- meta->skb = skb;
- meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
-- if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len)) {
-+ if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {
- ring->current_slot = old_top_slot;
- ring->used_slots = old_used_slots;
- err = -EIO;
-@@ -1337,6 +1344,7 @@ out_unlock:
- return err;
- }
-
-+/* Called with IRQs disabled. */
- void b43_dma_handle_txstatus(struct b43_wldev *dev,
- const struct b43_txstatus *status)
- {
-@@ -1349,8 +1357,8 @@ void b43_dma_handle_txstatus(struct b43_
- ring = parse_cookie(dev, status->cookie, &slot);
- if (unlikely(!ring))
- return;
-- B43_WARN_ON(!irqs_disabled());
-- spin_lock(&ring->lock);
-+
-+ spin_lock(&ring->lock); /* IRQs are already disabled. */
-
- B43_WARN_ON(!ring->tx);
- ops = ring->ops;
-diff -up linux-2.6.24.noarch/drivers/net/wireless/wavelan_cs.h.orig linux-2.6.24.noarch/drivers/net/wireless/wavelan_cs.h
---- linux-2.6.24.noarch/drivers/net/wireless/wavelan_cs.h.orig 2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/drivers/net/wireless/wavelan_cs.h 2008-03-25 12:57:57.000000000 -0400
-@@ -309,7 +309,7 @@ struct mmw_t
- #define MMW_EXT_ANT_INTERNAL 0x00 /* Internal antenna */
- #define MMW_EXT_ANT_EXTERNAL 0x03 /* External antenna */
- #define MMW_EXT_ANT_IQ_TEST 0x1C /* IQ test pattern (set to 0) */
--};
-+} __attribute__((packed));
- /* Size for structure checking (if padding is correct) */
- #define MMW_SIZE 37
-diff -up linux-2.6.24.noarch/drivers/net/wireless/arlan-proc.c.orig linux-2.6.24.noarch/drivers/net/wireless/arlan-proc.c
---- linux-2.6.24.noarch/drivers/net/wireless/arlan-proc.c.orig 2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/drivers/net/wireless/arlan-proc.c 2008-03-25 12:57:56.000000000 -0400
-@@ -1202,13 +1202,6 @@ static ctl_table arlan_table[MAX_ARLANS
- { .ctl_name = 0 }
- };
- #endif
--#else
--
--static ctl_table arlan_table[MAX_ARLANS + 1] =
--{
-- { .ctl_name = 0 }
--};
--#endif
+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-03-28 12:22:08.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-03-28 15:17:08.000000000 -0400
+@@ -1393,11 +1393,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");
-
- // static int mmtu = 1234;
-@@ -1233,7 +1226,6 @@ static ctl_table arlan_root_table[] =
- //};
-
-
--#ifdef CONFIG_PROC_FS
- static struct ctl_table_header *arlan_device_sysctl_header;
-
- int __init init_arlan_proc(void)
-diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c
---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2008-03-24 16:35:43.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-03-25 12:57:57.000000000 -0400
-@@ -6628,11 +6628,11 @@ static void iwl4965_alive_start(struct i
-
- /* At this point, the NIC is initialized and operational */
- priv->notif_missed_beacons = 0;
-- set_bit(STATUS_READY, &priv->status);
-
- iwl4965_rf_kill_ct_config(priv);
-
- IWL_DEBUG_INFO("ALIVE processing complete.\n");
-+ set_bit(STATUS_READY, &priv->status);
- wake_up_interruptible(&priv->wait_command_queue);
-
- if (priv->error_recovering)
-@@ -9282,7 +9282,7 @@ static int iwl4965_pci_probe(struct pci_
- return err;
- }
-
--static void iwl4965_pci_remove(struct pci_dev *pdev)
-+static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
- {
- struct iwl4965_priv *priv = pci_get_drvdata(pdev);
- struct list_head *p, *q;
-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-03-24 16:35:43.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig 2008-03-25 12:57:57.000000000 -0400
-@@ -20,7 +20,7 @@ config IWL4965
- runs.
-
- If you want to compile the driver as a module ( = code which can be
-- inserted in and remvoed from the running kernel whenever you want),
-+ inserted in and removed from the running kernel whenever you want),
- say M here and read <file:Documentation/kbuild/modules.txt>. The
- module will be called iwl4965.ko.
-
-@@ -101,7 +101,7 @@ config IWL3945
- runs.
-
- If you want to compile the driver as a module ( = code which can be
-- inserted in and remvoed from the running kernel whenever you want),
-+ inserted in and removed from the running kernel whenever you want),
- say M here and read <file:Documentation/kbuild/modules.txt>. The
- module will be called iwl3945.ko.
-
-diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2008-03-24 16:35:43.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-03-25 12:57:57.000000000 -0400
-@@ -6206,11 +6206,11 @@ static void iwl3945_alive_start(struct i
-
- /* At this point, the NIC is initialized and operational */
- priv->notif_missed_beacons = 0;
-- set_bit(STATUS_READY, &priv->status);
-
- iwl3945_reg_txpower_periodic(priv);
-
- IWL_DEBUG_INFO("ALIVE processing complete.\n");
-+ set_bit(STATUS_READY, &priv->status);
- wake_up_interruptible(&priv->wait_command_queue);
-
- if (priv->error_recovering)
-@@ -8706,7 +8706,7 @@ static int iwl3945_pci_probe(struct pci_
- return err;
+ return 0;
}
-
--static void iwl3945_pci_remove(struct pci_dev *pdev)
-+static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
- {
- struct iwl3945_priv *priv = pci_get_drvdata(pdev);
- struct list_head *p, *q;
-diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c
---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-03-24 16:35:43.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-03-25 12:57:57.000000000 -0400
-@@ -2095,6 +2095,8 @@ static struct usb_device_id rt73usb_devi
- { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) },
- /* Conceptronic */
- { USB_DEVICE(0x14b2, 0x3c22), USB_DEVICE_DATA(&rt73usb_ops) },
-+ /* Corega */
-+ { USB_DEVICE(0x07aa, 0x002e), USB_DEVICE_DATA(&rt73usb_ops) },
- /* D-Link */
- { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) },
- { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) },
--- linux-2.6-cfg80211-fixup.patch DELETED ---
--- linux-2.6-iwlwifi-sband-registration.patch DELETED ---
--- linux-2.6-mac80211-enc-off.patch DELETED ---
--- linux-2.6-prism54-mutex-thinko.patch DELETED ---
More information about the fedora-extras-commits
mailing list