diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-07-02 06:05:10 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-07-02 06:05:10 +0200 |
| commit | 12462d77ec78be9fb033580b7b64ddf9d0fee44b (patch) | |
| tree | a21157428d46259ed2c8a727ac12a2e658d8181a /net/mac80211/rx.c | |
| parent | sh: Fix up PUD trampling in ranged page table init for X2TLB. (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anh... (diff) | |
| download | linux-12462d77ec78be9fb033580b7b64ddf9d0fee44b.tar.xz linux-12462d77ec78be9fb033580b7b64ddf9d0fee44b.zip | |
Merge branches 'sh/highmem' and 'sh/stable-updates'
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 5e0b65406c44..be9abc2e6348 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1944,6 +1944,9 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) if (len < IEEE80211_MIN_ACTION_SIZE + 1) break; + if (sdata->vif.type == NL80211_IFTYPE_STATION) + return ieee80211_sta_rx_mgmt(sdata, rx->skb); + switch (mgmt->u.action.u.addba_req.action_code) { case WLAN_ACTION_ADDBA_REQ: if (len < (IEEE80211_MIN_ACTION_SIZE + |