From owner-svn-src-projects@FreeBSD.ORG  Fri Jul 10 11:59:14 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 D9DC91065678;
	Fri, 10 Jul 2009 11:59:14 +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 C8E258FC1D;
	Fri, 10 Jul 2009 11:59:14 +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 n6ABxEnr019502;
	Fri, 10 Jul 2009 11:59:14 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6ABxEmk019500;
	Fri, 10 Jul 2009 11:59:14 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200907101159.n6ABxEmk019500@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 10 Jul 2009 11:59:14 +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: r195554 - 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:59:15 -0000

Author: rpaulo
Date: Fri Jul 10 11:59:14 2009
New Revision: 195554
URL: http://svn.freebsd.org/changeset/base/195554

Log:
  Remove doprint().
  
  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:55:50 2009	(r195553)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jul 10 11:59:14 2009	(r195554)
@@ -567,24 +567,6 @@ mesh_newstate(struct ieee80211vap *vap, 
 }
 
 /*
- * Decide if a received management frame should be
- * printed when debugging is enabled.  This filters some
- * of the less interesting frames that come frequently
- * (e.g. beacons).
- */
-static __inline int
-doprint(struct ieee80211vap *vap, int subtype)
-{
-	switch (subtype) {
-	case IEEE80211_FC0_SUBTYPE_BEACON:
-		return (vap->iv_ic->ic_flags & IEEE80211_F_SCAN);
-	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
-		return 1;
-	}
-	return 1;
-}
-
-/*
  * Helper function to note the Mesh Peer Link FSM change.
  */
 static __inline void
@@ -1002,7 +984,8 @@ mesh_input(struct ieee80211_node *ni, st
 			goto out;
 		}
 #ifdef IEEE80211_DEBUG
-		if ((ieee80211_msg_debug(vap) && doprint(vap, subtype)) ||
+		if ((ieee80211_msg_debug(vap) && 
+		    (vap->iv_ic->ic_flags & IEEE80211_F_SCAN))
 		    ieee80211_msg_dumppkts(vap)) {
 			if_printf(ifp, "received %s from %s rssi %d\n",
 			    ieee80211_mgt_subtype_name[subtype >>