svn commit: r244061 - head/sys/net80211

[Adrian Chadd]

Author: adrian
Date: Sun Dec  9 23:56:29 2012
New Revision: 244061
URL: http://svnweb.freebsd.org/changeset/base/244061

Log:
  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

Modified:
  head/sys/net80211/ieee80211_adhoc.c

Modified: head/sys/net80211/ieee80211_adhoc.c
==============================================================================
--- head/sys/net80211/ieee80211_adhoc.c	Sun Dec  9 22:56:29 2012	(r244060)
+++ head/sys/net80211/ieee80211_adhoc.c	Sun Dec  9 23:56:29 2012	(r244061)
@@ -746,16 +746,6 @@ adhoc_recv_mgmt(struct ieee80211_node *n
 				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;