From owner-svn-src-projects@FreeBSD.ORG  Fri Jul 10 11:55:02 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 10B8E106564A;
	Fri, 10 Jul 2009 11:55:02 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F03BD8FC1D;
	Fri, 10 Jul 2009 11:55:01 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6ABt1SU019361;
	Fri, 10 Jul 2009 11:55:01 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6ABt1Bp019359;
	Fri, 10 Jul 2009 11:55:01 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200907101155.n6ABt1Bp019359@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 10 Jul 2009 11:55:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195552 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jul 2009 11:55:02 -0000

Author: rpaulo
Date: Fri Jul 10 11:55:01 2009
New Revision: 195552
URL: http://svn.freebsd.org/changeset/base/195552

Log:
  Remove is11bclient.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jul 10 11:53:35 2009	(r195551)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jul 10 11:55:01 2009	(r195552)
@@ -1039,23 +1039,6 @@ out:
 	return type;
 }
 
-static int
-is11bclient(const uint8_t *rates, const uint8_t *xrates)
-{
-	static const uint32_t brates = (1<<2*1)|(1<<2*2)|(1<<11)|(1<<2*11);
-	int i;
- 
-	/* NB: the 11b clients we care about will not have xrates */
-	if (xrates != NULL || rates == NULL)
-		return 0;
-	for (i = 0; i < rates[1]; i++) {
-		int r = rates[2+i] & IEEE80211_RATE_VAL;
-		if (r > 2*11 || ((1<<r) & brates) == 0)
-			return 0;
-	}
-	return 1;
-}
-
 static void
 mesh_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype,
     int rssi, int nf)
@@ -1244,8 +1227,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 		 * only a bare-bones rate set, communicate this to
 		 * the transmit side.
 		 */
-		ieee80211_send_proberesp(vap, wh->i_addr2,
-		    is11bclient(rates, xrates) ? IEEE80211_SEND_LEGACY_11B : 0);
+		ieee80211_send_proberesp(vap, wh->i_addr2, 0);
 		break;
 	}
 	case IEEE80211_FC0_SUBTYPE_ACTION: