Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

4 files changed, 10 insertions, 12 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index d13ae9c299f2..28c5fbb4af26 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -691,9 +691,10 @@ scan_out:
 }
 
 static s32
-brcmf_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+brcmf_cfg80211_scan(struct wiphy *wiphy,
                  struct cfg80211_scan_request *request)
 {
+        struct net_device *ndev = request->wdev->netdev;
         s32 err = 0;
 
         WL_TRACE("Enter\n");
@@ -919,9 +920,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
         set_bit(WL_STATUS_CONNECTING, &cfg_priv->status);
 
         if (params->bssid)
-                WL_CONN("BSSID: %02X %02X %02X %02X %02X %02X\n",
-                params->bssid[0], params->bssid[1], params->bssid[2],
-                params->bssid[3], params->bssid[4], params->bssid[5]);
+                WL_CONN("BSSID: %pM\n", params->bssid);
         else
                 WL_CONN("No BSSID specified\n");
 
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
index 01b190a25d94..be5bcfb9153b 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
@@ -663,9 +663,6 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi,
                 /* patch the first MPDU */
                 if (count == 1) {
                         u8 plcp0, plcp3, is40, sgi;
-                        struct ieee80211_sta *sta;
-
-                        sta = tx_info->control.sta;
 
                         if (rr) {
                                 plcp0 = plcp[0];
@@ -1195,8 +1192,8 @@ static bool cb_del_ampdu_pkt(struct sk_buff *mpdu, void *arg_a)
         bool rc;
 
         rc = tx_info->flags & IEEE80211_TX_CTL_AMPDU ? true : false;
-        rc = rc && (tx_info->control.sta == NULL || ampdu_pars->sta == NULL ||
-                    tx_info->control.sta == ampdu_pars->sta);
+        rc = rc && (tx_info->rate_driver_data[0] == NULL || ampdu_pars->sta == NULL ||
+                    tx_info->rate_driver_data[0] == ampdu_pars->sta);
         rc = rc && ((u8)(mpdu->priority) == ampdu_pars->tid);
         return rc;
 }
@@ -1210,8 +1207,8 @@ static void dma_cb_fn_ampdu(void *txi, void *arg_a)
         struct ieee80211_tx_info *tx_info = (struct ieee80211_tx_info *)txi;
 
         if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) &&
-            (tx_info->control.sta == sta || sta == NULL))
-                tx_info->control.sta = NULL;
+            (tx_info->rate_driver_data[0] == sta || sta == NULL))
+                tx_info->rate_driver_data[0] = NULL;
 }
 
 /*
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 2b57f57a7927..9e79d47e077f 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -267,6 +267,7 @@ static void brcms_set_basic_rate(struct brcm_rateset *rs, u16 rate, bool is_br)
 static void brcms_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         struct brcms_info *wl = hw->priv;
+        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
 
         spin_lock_bh(&wl->lock);
         if (!wl->pub->up) {
@@ -275,6 +276,7 @@ static void brcms_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                 goto done;
         }
         brcms_c_sendpkt_mac80211(wl->wlc, skb, hw);
+        tx_info->rate_driver_data[0] = tx_info->control.sta;
  done:
         spin_unlock_bh(&wl->lock);
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index cb73f2250b11..03ca65324845 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -893,7 +893,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
         tx_info = IEEE80211_SKB_CB(p);
         h = (struct ieee80211_hdr *)((u8 *) (txh + 1) + D11_PHY_HDR_LEN);
 
-        if (tx_info->control.sta)
+        if (tx_info->rate_driver_data[0])
                 scb = &wlc->pri_scb;
 
         if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {