Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	net/mac80211/mlme.c

2 files changed, 18 insertions, 6 deletions

diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index cd598c0d8d6d..bcec74e839e9 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -290,7 +290,7 @@ static inline void ath5k_txbuf_free(struct ath5k_softc *sc,
                 return;
         pci_unmap_single(sc->pdev, bf->skbaddr, bf->skb->len,
                         PCI_DMA_TODEVICE);
-        dev_kfree_skb(bf->skb);
+        dev_kfree_skb_any(bf->skb);
         bf->skb = NULL;
 }
 
@@ -505,6 +505,7 @@ ath5k_pci_probe(struct pci_dev *pdev,
         mutex_init(&sc->lock);
         spin_lock_init(&sc->rxbuflock);
         spin_lock_init(&sc->txbuflock);
+        spin_lock_init(&sc->block);
 
         /* Set private data */
         pci_set_drvdata(pdev, hw);
@@ -2123,8 +2124,11 @@ ath5k_beacon_config(struct ath5k_softc *sc)
 
                 sc->imask |= AR5K_INT_SWBA;
 
-                if (ath5k_hw_hasveol(ah))
+                if (ath5k_hw_hasveol(ah)) {
+                        spin_lock(&sc->block);
                         ath5k_beacon_send(sc);
+                        spin_unlock(&sc->block);
+                }
         }
         /* TODO else AP */
 
@@ -2324,7 +2328,9 @@ ath5k_intr(int irq, void *dev_id)
                                                   TSF_TO_TU(tsf),
                                                   (unsigned long long) tsf);
                                 } else {
+                                        spin_lock(&sc->block);
                                         ath5k_beacon_send(sc);
+                                        spin_unlock(&sc->block);
                                 }
                         }
                         if (status & AR5K_INT_RXEOL) {
@@ -2685,6 +2691,11 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
                 ret = -EOPNOTSUPP;
                 goto end;
         }
+
+        /* Set to a reasonable value. Note that this will
+         * be set to mac80211's value at ath5k_config(). */
+        sc->bintval = 1000;
+
         ret = 0;
 end:
         mutex_unlock(&sc->lock);
@@ -2729,9 +2740,6 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         struct ath5k_hw *ah = sc->ah;
         int ret;
 
-        /* Set to a reasonable value. Note that this will
-         * be set to mac80211's value at ath5k_config(). */
-        sc->bintval = 1000;
         mutex_lock(&sc->lock);
         if (sc->vif != vif) {
                 ret = -EIO;
@@ -2991,6 +2999,7 @@ static int
 ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         struct ath5k_softc *sc = hw->priv;
+        unsigned long flags;
         int ret;
 
         ath5k_debug_dump_skb(sc, skb, "BC  ", 1);
@@ -3000,12 +3009,14 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
                 goto end;
         }
 
+        spin_lock_irqsave(&sc->block, flags);
         ath5k_txbuf_free(sc, sc->bbuf);
         sc->bbuf->skb = skb;
         ret = ath5k_beacon_setup(sc, sc->bbuf);
         if (ret)
                 sc->bbuf->skb = NULL;
-        else {
+        spin_unlock_irqrestore(&sc->block, flags);
+        if (!ret) {
                 ath5k_beacon_config(sc);
                 mmiowb();
         }
diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h
index 248e32eb6cb3..1549b63d6138 100644
--- a/drivers/net/wireless/ath5k/base.h
+++ b/drivers/net/wireless/ath5k/base.h
@@ -168,6 +168,7 @@ struct ath5k_softc {
         struct tasklet_struct   txtq;           /* tx intr tasklet */
         struct ath5k_led        tx_led;         /* tx led */
 
+        spinlock_t              block;          /* protects beacon */
         struct ath5k_buf        *bbuf;          /* beacon buffer */
         unsigned int            bhalq,          /* SW q for outgoing beacons */
                                 bmisscount,     /* missed beacon transmits */