Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 290571
b: refs/heads/master
c: 2801d69
h: refs/heads/master
i:
  290569: 608cbb7
  290567: febd5ca
v: v3
  • Loading branch information
Eliad Peller authored and Luciano Coelho committed Feb 15, 2012
1 parent a4b9971 commit 4514457
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 32 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7db4ee6d0a932bb95f839d9b427899b74139a8d5
refs/heads/master: 2801d69e84d04714c22f8cc22fbe8535ac5f1eb7
31 changes: 0 additions & 31 deletions trunk/drivers/net/wireless/wl12xx/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,35 +77,6 @@ static void wl1271_free_tx_id(struct wl1271 *wl, int id)
}
}

static int wl1271_tx_update_filters(struct wl1271 *wl,
struct wl12xx_vif *wlvif,
struct sk_buff *skb)
{
struct ieee80211_hdr *hdr;
int ret;

hdr = (struct ieee80211_hdr *)skb->data;

/*
* stop bssid-based filtering before transmitting authentication
* requests. this way the hw will never drop authentication
* responses coming from BSSIDs it isn't familiar with (e.g. on
* roaming)
*/
if (!ieee80211_is_auth(hdr->frame_control))
return 0;

if (wlvif->dev_hlid != WL12XX_INVALID_LINK_ID)
goto out;

wl1271_debug(DEBUG_CMD, "starting device role for roaming");
ret = wl12xx_start_dev(wl, wlvif);
if (ret < 0)
goto out;
out:
return 0;
}

static void wl1271_tx_ap_update_inconnection_sta(struct wl1271 *wl,
struct sk_buff *skb)
{
Expand Down Expand Up @@ -187,8 +158,6 @@ u8 wl12xx_tx_get_hlid(struct wl1271 *wl, struct wl12xx_vif *wlvif,
if (wlvif->bss_type == BSS_TYPE_AP_BSS)
return wl12xx_tx_get_hlid_ap(wl, wlvif, skb);

wl1271_tx_update_filters(wl, wlvif, skb);

if ((test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags) ||
test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags)) &&
!ieee80211_is_auth(hdr->frame_control) &&
Expand Down

0 comments on commit 4514457

Please sign in to comment.