From c24eacfe6e2f8d382e0c0df8d1872b25c92b7edd Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 24 Mar 2009 08:46:57 +0100 Subject: [PATCH] --- yaml --- r: 136199 b: refs/heads/master c: 3832c287f11ba001bbe48e9be8c59cb9f71f6b43 h: refs/heads/master i: 136197: d261334a81cc3ede81cd8103242e6705bf54a064 136195: ab476d089962805b200257c2af559865e0bc22da 136191: f749f044fbaadf323e1460f6ca61fea5bbb127fe v: v3 --- [refs] | 2 +- trunk/net/mac80211/rx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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)