summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-20 09:29:34 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-20 09:29:34 +0000
commitba3ef5325d36035a125c0747296bd3ed7cbab993 (patch)
tree3d413d52e4068f3fdf88225ab2511ec0b0962830
parent29791a765cc2ffc02bfdc721f950205669f06c2a (diff)
mac80211: refresh p54spi patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29272 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/850-p54spi-lock-fix.patch6
-rw-r--r--package/mac80211/patches/851-p54spi-mutex-fix.patch6
-rw-r--r--package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch6
3 files changed, 6 insertions, 12 deletions
diff --git a/package/mac80211/patches/850-p54spi-lock-fix.patch b/package/mac80211/patches/850-p54spi-lock-fix.patch
index 9ab15dd55..d19ba6170 100644
--- a/package/mac80211/patches/850-p54spi-lock-fix.patch
+++ b/package/mac80211/patches/850-p54spi-lock-fix.patch
@@ -1,7 +1,5 @@
-Index: compat-wireless-2011-11-04/drivers/net/wireless/p54/p54spi.c
-===================================================================
---- compat-wireless-2011-11-04.orig/drivers/net/wireless/p54/p54spi.c 2011-11-05 20:30:04.000000000 +0100
-+++ compat-wireless-2011-11-04/drivers/net/wireless/p54/p54spi.c 2011-11-16 22:12:03.648829886 +0100
+--- a/drivers/net/wireless/p54/p54spi.c
++++ b/drivers/net/wireless/p54/p54spi.c
@@ -656,6 +656,7 @@ static int __devinit p54spi_probe(struct
init_completion(&priv->fw_comp);
INIT_LIST_HEAD(&priv->tx_pending);
diff --git a/package/mac80211/patches/851-p54spi-mutex-fix.patch b/package/mac80211/patches/851-p54spi-mutex-fix.patch
index 27019de65..e974e9dda 100644
--- a/package/mac80211/patches/851-p54spi-mutex-fix.patch
+++ b/package/mac80211/patches/851-p54spi-mutex-fix.patch
@@ -1,7 +1,5 @@
-Index: compat-wireless-2011-11-04/drivers/net/wireless/p54/p54spi.c
-===================================================================
---- compat-wireless-2011-11-04.orig/drivers/net/wireless/p54/p54spi.c 2011-11-16 22:12:03.648829886 +0100
-+++ compat-wireless-2011-11-04/drivers/net/wireless/p54/p54spi.c 2011-11-16 22:15:28.931976935 +0100
+--- a/drivers/net/wireless/p54/p54spi.c
++++ b/drivers/net/wireless/p54/p54spi.c
@@ -581,11 +581,7 @@ static void p54spi_op_stop(struct ieee80
struct p54s_priv *priv = dev->priv;
unsigned long flags;
diff --git a/package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch b/package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch
index c5302931e..f8d36ca04 100644
--- a/package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch
+++ b/package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch
@@ -1,7 +1,5 @@
-Index: compat-wireless-2011-11-04/drivers/net/wireless/p54/p54spi.c
-===================================================================
---- compat-wireless-2011-11-04.orig/drivers/net/wireless/p54/p54spi.c 2011-11-16 23:36:01.399952345 +0100
-+++ compat-wireless-2011-11-04/drivers/net/wireless/p54/p54spi.c 2011-11-16 23:37:38.799547564 +0100
+--- a/drivers/net/wireless/p54/p54spi.c
++++ b/drivers/net/wireless/p54/p54spi.c
@@ -584,8 +584,6 @@ static void p54spi_op_stop(struct ieee80
mutex_lock(&priv->mutex);
WARN_ON(priv->fw_state != FW_STATE_READY);