diff --git a/[refs] b/[refs] index 9cee1333b36a..9bbc2a46f77b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a0fe8ac70f81b5b91156736066e6445d0dcc61f +refs/heads/master: 3832c287f11ba001bbe48e9be8c59cb9f71f6b43 diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c index eff59f36e8eb..64ebe664effc 100644 --- a/trunk/net/mac80211/rx.c +++ b/trunk/net/mac80211/rx.c @@ -1884,7 +1884,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx) if (ieee80211_vif_is_mesh(&sdata->vif)) return ieee80211_mesh_rx_mgmt(sdata, rx->skb, rx->status); - if (sdata->vif.type != NL80211_IFTYPE_ADHOC) + if (sdata->vif.type == NL80211_IFTYPE_ADHOC) return ieee80211_ibss_rx_mgmt(sdata, rx->skb, rx->status); if (sdata->vif.type == NL80211_IFTYPE_STATION)