From owner-svn-src-all@FreeBSD.ORG  Sun Dec  9 23:56:30 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8DEC477D;
 Sun,  9 Dec 2012 23:56:30 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 727A98FC13;
 Sun,  9 Dec 2012 23:56:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB9NuUGV064558;
 Sun, 9 Dec 2012 23:56:30 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB9NuUdU064557;
 Sun, 9 Dec 2012 23:56:30 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201212092356.qB9NuUdU064557@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 9 Dec 2012 23:56:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244061 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Dec 2012 23:56:30 -0000

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;