remove brcm patch that was incorrect.

diff --git a/review-2.6.37/series b/review-2.6.37/series
index e9ba49e55cd96745f09d16f13e565d15f8269264..09d23bc37b1d73068f4175e7226c8378c5f193a5 100644 (file)
--- a/review-2.6.37/series
+++ b/review-2.6.37/series
@@ -25,7 +25,6 @@ cred-fix-kernel-panic-upon-security_file_alloc-failure.patch
 btrfs-prevent-heap-corruption-in-btrfs_ioctl_space_info.patch
 cred-fix-bug-upon-security_cred_alloc_blank-failure.patch
 cred-fix-memory-and-refcount-leaks-upon-security_prepare_creds-failure.patch
-staging-brcm80211-bugfix-for-softmac-crash-on-multi-cpu-configurations.patch
 security-add-cred-argument-to-security_capable.patch
 pci-use-security_capable-when-checking-capablities-during-config-space-read.patch
 acpi-wakeup-enable-button-gpes-unconditionally-during-initialization.patch

diff --git a/review-2.6.37/staging-brcm80211-bugfix-for-softmac-crash-on-multi-cpu-configurations.patch b/review-2.6.37/staging-brcm80211-bugfix-for-softmac-crash-on-multi-cpu-configurations.patch
deleted file mode 100644 (file)
index e0315e2..0000000
--- a/review-2.6.37/staging-brcm80211-bugfix-for-softmac-crash-on-multi-cpu-configurations.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6a3be6e6e7feb4cb35275475d6a863b748d59cc3 Mon Sep 17 00:00:00 2001
-From: Roland Vossen <rvossen@broadcom.com>
-Date: Tue, 25 Jan 2011 11:51:56 +0100
-Subject: staging: brcm80211: bugfix for softmac crash on multi cpu configurations
-
-From: Roland Vossen <rvossen@broadcom.com>
-
-commit 6a3be6e6e7feb4cb35275475d6a863b748d59cc3 upstream.
-
-Solved a locking issue that resulted in driver crashes with the 43224 and 43225
-chips. The problem has been reported on several fora. Root cause was two fold:
-hardware was being manipulated by two unsynchronized threads, and a scan
-operation could interfere with an ongoing dynamic calibration process. Fix was
-to invoke a lock on wl_ops_config() operation and to set internal flags when a
-scan operation is started and stopped.
-
-Please add this to the staging-linus branch.
-
-Signed-off-by: Roland Vossen <rvossen@broadcom.com>
-Acked-by: Brett Rudley <brudley@broadcom.com>
-Signed-off-by: Arend van Spriel <arend@broadcom.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-
----
- drivers/staging/brcm80211/sys/wlc_mac80211.c |    1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
-+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
-@@ -5336,7 +5336,6 @@ wlc_sendpkt_mac80211(wlc_info_t *wlc, vo
-       fifo = prio2fifo[prio];
- 
-       ASSERT((uint) PKTHEADROOM(sdu) >= TXOFF);
--      ASSERT(!PKTSHARED(sdu));
-       ASSERT(!PKTNEXT(sdu));
-       ASSERT(!PKTLINK(sdu));
-       ASSERT(fifo < NFIFO);