diff options
| author | sam <sam@FreeBSD.org> | 2005-06-13 21:01:06 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-06-13 21:01:06 +0000 |
| commit | 4e4b8392b5645b9230a9ff0aa3e7c48adf22c67e (patch) | |
| tree | 66cd488b3d3398b891b98b8232bd7849b68af5dc | |
| parent | 44ce56b0772938d038aad76caa436acfef6271e2 (diff) | |
| download | FreeBSD-src-4e4b8392b5645b9230a9ff0aa3e7c48adf22c67e.zip FreeBSD-src-4e4b8392b5645b9230a9ff0aa3e7c48adf22c67e.tar.gz | |
revert 1.53; it breaks ibss merge
Noticed by: Bruno Randolf
Approved by: re (dwhite)
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index b2856a3..46d0e60 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -216,6 +216,8 @@ ieee80211_input(struct ieee80211com *ic, struct mbuf *m, } bssid = wh->i_addr3; } + if (type != IEEE80211_FC0_TYPE_DATA) + break; /* * Data frame, validate the bssid. */ @@ -227,8 +229,6 @@ ieee80211_input(struct ieee80211com *ic, struct mbuf *m, ic->ic_stats.is_rx_wrongbss++; goto out; } - if (type != IEEE80211_FC0_TYPE_DATA) - break; /* * For adhoc mode we cons up a node when it doesn't * exist. This should probably done after an ACL check. |
