From owner-p4-projects@FreeBSD.ORG  Fri Apr  6 17:27:02 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F018816A406; Fri,  6 Apr 2007 17:27:01 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C66E916A402
	for <perforce@freebsd.org>; Fri,  6 Apr 2007 17:27:01 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B88C113C46A
	for <perforce@freebsd.org>; Fri,  6 Apr 2007 17:27:01 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36HR1dD081463
	for <perforce@freebsd.org>; Fri, 6 Apr 2007 17:27:01 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36HR1KE081460
	for perforce@freebsd.org; Fri, 6 Apr 2007 17:27:01 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 6 Apr 2007 17:27:01 GMT
Message-Id: <200704061727.l36HR1KE081460@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 117526 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 17:27:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=117526

Change 117526 by sam@sam_ebb on 2007/04/06 17:26:12

	remove dup code from mis-merge

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#90 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#90 (text+ko) ====

@@ -957,15 +957,6 @@
 		}
 		/* XXX not right for 802.1x/WPA */
 		ieee80211_node_authorize(ni);
-		if (ic->ic_opmode == IEEE80211_M_AHDEMO) {
-			/*
-			 * Blindly propagate capabilities based on the
-			 * local configuration.  In particular this permits
-			 * us to use QoS to disable ACK's.
-			 */
-			if (ic->ic_flags & IEEE80211_F_WME)
-				ni->ni_flags |= IEEE80211_NODE_QOS;
-		}
 	}
 	return ni;
 }