diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-08 15:55:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-08 15:55:21 -0700 |
| commit | 67972e0c238fa802580b5919f11e1de3da5179da (patch) | |
| tree | 27022c957154a9d36fc8aa0f020bed523e7849b3 /net/mac80211/rx.c | |
| parent | ad61df918c44316940404891d5082c63e79c256a (diff) | |
| parent | 8a8e05e5d8f6155788761961fc9845328863c16d (diff) | |
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 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index c01588f9d45..865fbc09be1 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2164,11 +2164,17 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, skb = rx.skb; - list_for_each_entry_rcu(sdata, &local->interfaces, list) { + if (rx.sdata && ieee80211_is_data(hdr->frame_control)) { + rx.flags |= IEEE80211_RX_RA_MATCH; + prepares = prepare_for_handlers(rx.sdata, &rx, hdr); + if (prepares) + prev = rx.sdata; + } else list_for_each_entry_rcu(sdata, &local->interfaces, list) { if (!netif_running(sdata->dev)) continue; - if (sdata->vif.type == NL80211_IFTYPE_MONITOR) + if (sdata->vif.type == NL80211_IFTYPE_MONITOR || + sdata->vif.type == NL80211_IFTYPE_AP_VLAN) continue; rx.flags |= IEEE80211_RX_RA_MATCH; |