wl12xx: Use dev_hlid for auth and assoc req
authorEliad Peller <eliad@wizery.com>
Thu, 15 Sep 2011 13:05:47 +0000 (16:05 +0300)
committerLuciano Coelho <coelho@ti.com>
Fri, 23 Sep 2011 11:38:51 +0000 (14:38 +0300)
On roaming, the auth and assoc req are sent with the sta
hlid. This is wrong, as the sta hlid is configured according
to the old ap. Use the dev_hlid instead.

Move the wl1271_tx_update_filters() call into wl1271_tx_get_hlid(),
so wl->dev_hlid will be valid.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
drivers/net/wireless/wl12xx/tx.c

index 9d4157c..f6e95e4 100644 (file)
@@ -81,8 +81,7 @@ static int wl1271_tx_update_filters(struct wl1271 *wl,
        struct ieee80211_hdr *hdr;
        int ret;
 
-       hdr = (struct ieee80211_hdr *)(skb->data +
-                                      sizeof(struct wl1271_tx_hw_descr));
+       hdr = (struct ieee80211_hdr *)skb->data;
 
        /*
         * stop bssid-based filtering before transmitting authentication
@@ -181,14 +180,20 @@ u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct sk_buff *skb)
 
 static u8 wl1271_tx_get_hlid(struct wl1271 *wl, struct sk_buff *skb)
 {
+       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+
        if (wl12xx_is_dummy_packet(wl, skb))
                return wl->system_hlid;
 
        if (wl->bss_type == BSS_TYPE_AP_BSS)
                return wl12xx_tx_get_hlid_ap(wl, skb);
 
-       if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags) ||
-           test_bit(WL1271_FLAG_IBSS_JOINED, &wl->flags))
+       wl1271_tx_update_filters(wl, skb);
+
+       if ((test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags) ||
+            test_bit(WL1271_FLAG_IBSS_JOINED, &wl->flags)) &&
+           !ieee80211_is_auth(hdr->frame_control) &&
+           !ieee80211_is_assoc_req(hdr->frame_control))
                return wl->sta_hlid;
        else
                return wl->dev_hlid;
@@ -423,8 +428,6 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb,
        if (wl->bss_type == BSS_TYPE_AP_BSS) {
                wl1271_tx_ap_update_inconnection_sta(wl, skb);
                wl1271_tx_regulate_link(wl, hlid);
-       } else {
-               wl1271_tx_update_filters(wl, skb);
        }
 
        /*