From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 19 13:08:50 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 26E641065672;
	Fri, 19 Jun 2009 13:08:50 +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 157198FC12;
	Fri, 19 Jun 2009 13:08:50 +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 n5JD8nvJ044419;
	Fri, 19 Jun 2009 13:08:49 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5JD8ncO044417;
	Fri, 19 Jun 2009 13:08:49 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906191308.n5JD8ncO044417@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 19 Jun 2009 13:08:49 +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: r194491 - 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, 19 Jun 2009 13:08:50 -0000

Author: rpaulo
Date: Fri Jun 19 13:08:49 2009
New Revision: 194491
URL: http://svn.freebsd.org/changeset/base/194491

Log:
  Don't call classify as it expects an ethernet header.
  
  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 Jun 19 12:51:32 2009	(r194490)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jun 19 13:08:49 2009	(r194491)
@@ -412,18 +412,7 @@ mesh_input(struct ieee80211_node *ni, st
 			    ieee80211_hdrspace(ic, wh));
 			IEEE80211_ADDR_COPY(whcopy->i_addr2, vap->iv_myaddr);
 			mccopy->mc_ttl--;
-			/* calculate priority so drivers can find the tx queue */
-			if (ieee80211_classify(vap->iv_bss, mcopy)) {
-				IEEE80211_DISCARD_MAC(vap,
-				    IEEE80211_MSG_OUTPUT | IEEE80211_MSG_MESH,
-				    wh->i_addr2, NULL, "%s",
-				    "classification failed");
-				vap->iv_stats.is_tx_classify++;
-				ifp->if_oerrors++;
-				m_freem(mcopy);
-				ieee80211_free_node(vap->iv_bss);
-				goto deliver;
-			}
+			/* XXX calculate priority so drivers can find the tx queue */
 			mcopy->m_flags |= M_MCAST;
 			mcopy->m_pkthdr.rcvif = (void *) vap->iv_bss;
 			if (parent->if_transmit(parent, mcopy)) {