diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-03-24 03:46:57 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-03-27 20:13:19 -0400 |
| commit | 3832c287f11ba001bbe48e9be8c59cb9f71f6b43 (patch) | |
| tree | 51ba8fb5a6e92e82456544f74c14425e2b0b6a5c /net | |
| parent | 5a0fe8ac70f81b5b91156736066e6445d0dcc61f (diff) | |
mac80211: fix RX path
My previous patch ("mac80211: remove mixed-cell and userspace MLME code")
was too obvious to me, so obvious that a stupid bug crept in. The IBSS
RX function must be invoked for IBSS, of course, not anything != IBSS.
Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index eff59f36e8eb..64ebe664effc 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
| @@ -1884,7 +1884,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx) | |||
| 1884 | if (ieee80211_vif_is_mesh(&sdata->vif)) | 1884 | if (ieee80211_vif_is_mesh(&sdata->vif)) |
| 1885 | return ieee80211_mesh_rx_mgmt(sdata, rx->skb, rx->status); | 1885 | return ieee80211_mesh_rx_mgmt(sdata, rx->skb, rx->status); |
| 1886 | 1886 | ||
| 1887 | if (sdata->vif.type != NL80211_IFTYPE_ADHOC) | 1887 | if (sdata->vif.type == NL80211_IFTYPE_ADHOC) |
| 1888 | return ieee80211_ibss_rx_mgmt(sdata, rx->skb, rx->status); | 1888 | return ieee80211_ibss_rx_mgmt(sdata, rx->skb, rx->status); |
| 1889 | 1889 | ||
| 1890 | if (sdata->vif.type == NL80211_IFTYPE_STATION) | 1890 | if (sdata->vif.type == NL80211_IFTYPE_STATION) |