diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-09 11:13:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-09 11:13:23 -0700 |
| commit | 327723edebbbd621ed35b0d63073685eb225563e (patch) | |
| tree | 5983bf544284c4bd11028e198c937f86be358dc4 /net/mac80211/rx.c | |
| parent | 035320d54758e21227987e3aae0d46e7a04f4ddc (diff) | |
| parent | b054b747a694927879c94dd11af54d04346aed7d (diff) | |
| download | op-kernel-dev-327723edebbbd621ed35b0d63073685eb225563e.zip op-kernel-dev-327723edebbbd621ed35b0d63073685eb225563e.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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 5e0b654..be9abc2 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 + |
