diff options
| author | adrian <adrian@FreeBSD.org> | 2012-12-09 23:56:29 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2012-12-09 23:56:29 +0000 |
| commit | e8cc21d4436221e2dcc31726aa694db1a92c562e (patch) | |
| tree | c913ec289f220e518d7317912ec8b5676de27414 | |
| parent | c64b0a566639da3979f8ea37837e905133c9e147 (diff) | |
| download | FreeBSD-src-e8cc21d4436221e2dcc31726aa694db1a92c562e.zip FreeBSD-src-e8cc21d4436221e2dcc31726aa694db1a92c562e.tar.gz | |
Undo the previous adhoc commit - doing the WME IE handling here
is totally wrong.
If we parse the WME IE here, we'll be constantly updating the WME
configuration from each WME enabled IBSS node we see.
There's a separate issue where the WME configuration is blanked out
when the interface is brought up; the WME parameters aren't "sticky."
Also, ieee80211_init_neighbor() parses the ath IE, so doing it here
isn't required.
Sorry about the noise.
PR: kern/165969
| -rw-r--r-- | sys/net80211/ieee80211_adhoc.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c index e748725..060dc6e 100644 --- a/sys/net80211/ieee80211_adhoc.c +++ b/sys/net80211/ieee80211_adhoc.c @@ -746,16 +746,6 @@ adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, memcpy(ni->ni_tstamp.data, scan.tstamp, sizeof(ni->ni_tstamp)); } - if (scan.wme != NULL && - (ni->ni_flags & IEEE80211_NODE_QOS) && - ieee80211_parse_wmeparams(vap, scan.wme, wh) > 0) { - ieee80211_wme_updateparams(vap); - } -#ifdef IEEE80211_SUPPORT_SUPERG - if (scan.ath != NULL) { - ieee80211_parse_athparams(ni, scan.ath, wh); - } -#endif if (ni != NULL) { IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); ni->ni_noise = nf; |
