p54spi: Lock fixes

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29200 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/mac80211/patches/850-p54spi-lock-fix.patch b/package/mac80211/patches/850-p54spi-lock-fix.patch
new file mode 100644 (file)
index 0000000..9ab15dd
--- /dev/null
+++ b/package/mac80211/patches/850-p54spi-lock-fix.patch
@@ -0,0 +1,12 @@
+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
+@@ -656,6 +656,7 @@ static int __devinit p54spi_probe(struct
+       init_completion(&priv->fw_comp);
+       INIT_LIST_HEAD(&priv->tx_pending);
+       mutex_init(&priv->mutex);
++      spin_lock_init(&priv->tx_lock);
+       SET_IEEE80211_DEV(hw, &spi->dev);
+       priv->common.open = p54spi_op_start;
+       priv->common.stop = p54spi_op_stop;

diff --git a/package/mac80211/patches/851-p54spi-mutex-fix.patch b/package/mac80211/patches/851-p54spi-mutex-fix.patch
new file mode 100644 (file)
index 0000000..27019de
--- /dev/null
+++ b/package/mac80211/patches/851-p54spi-mutex-fix.patch
@@ -0,0 +1,17 @@
+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
+@@ -581,11 +581,7 @@ static void p54spi_op_stop(struct ieee80
+       struct p54s_priv *priv = dev->priv;
+       unsigned long flags;
+ 
+-      if (mutex_lock_interruptible(&priv->mutex)) {
+-              /* FIXME: how to handle this error? */
+-              return;
+-      }
+-
++      mutex_lock(&priv->mutex);
+       WARN_ON(priv->fw_state != FW_STATE_READY);
+ 
+       cancel_work_sync(&priv->work);