From owner-p4-projects@FreeBSD.ORG Mon Apr 30 05:40:06 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD54D16A403; Mon, 30 Apr 2007 05:40:06 +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 83D6D16A401 for ; Mon, 30 Apr 2007 05:40:06 +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 7584113C448 for ; Mon, 30 Apr 2007 05:40:06 +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 l3U5e6M8085296 for ; Mon, 30 Apr 2007 05:40:06 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3U5e60v085293 for perforce@freebsd.org; Mon, 30 Apr 2007 05:40:06 GMT (envelope-from sam@freebsd.org) Date: Mon, 30 Apr 2007 05:40:06 GMT Message-Id: <200704300540.l3U5e60v085293@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 118971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Apr 2007 05:40:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=118971 Change 118971 by sam@sam_ebb on 2007/04/30 05:39:49 fix building w/o IEEE80211_DEBUG Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#91 edit .. //depot/projects/wifi/sys/net80211/ieee80211_power.c#6 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#55 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#91 (text+ko) ==== @@ -1194,7 +1194,6 @@ #define MATCH_SSID(ni, ssid, ssidlen) \ (ni->ni_esslen == ssidlen && memcmp(ni->ni_essid, ssid, ssidlen) == 0) static const u_int8_t zeromac[IEEE80211_ADDR_LEN]; - struct ieee80211com *ic = nt->nt_ic; struct ieee80211_node *ni; int hash; @@ -1218,7 +1217,7 @@ } if (ni != NULL) { ieee80211_ref_node(ni); /* mark referenced */ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + IEEE80211_DPRINTF(nt->nt_ic, IEEE80211_MSG_NODE, REFCNT_LOC, ni, ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)); } ==== //depot/projects/wifi/sys/net80211/ieee80211_power.c#6 (text+ko) ==== @@ -119,7 +119,6 @@ int ieee80211_node_saveq_age(struct ieee80211_node *ni) { - struct ieee80211com *ic = ni->ni_ic; int discard = 0; if (IEEE80211_NODE_SAVEQ_QLEN(ni) != 0) { @@ -128,7 +127,7 @@ IEEE80211_NODE_SAVEQ_LOCK(ni); while (IF_POLL(&ni->ni_savedq, m) != NULL && M_AGE_GET(m) < IEEE80211_INACT_WAIT) { -IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, "[%s] discard frame, age %u\n", ether_sprintf(ni->ni_macaddr), M_AGE_GET(m));/*XXX*/ +IEEE80211_DPRINTF(ni->ni_ic, IEEE80211_MSG_POWER, "[%s] discard frame, age %u\n", ether_sprintf(ni->ni_macaddr), M_AGE_GET(m));/*XXX*/ _IEEE80211_NODE_SAVEQ_DEQUEUE_HEAD(ni, m); m_freem(m); discard++; @@ -137,7 +136,7 @@ M_AGE_SUB(m, IEEE80211_INACT_WAIT); IEEE80211_NODE_SAVEQ_UNLOCK(ni); - IEEE80211_NOTE(ic, IEEE80211_MSG_POWER, ni, + IEEE80211_NOTE(ni->ni_ic, IEEE80211_MSG_POWER, ni, "discard %u frames for age", discard); IEEE80211_NODE_STAT_ADD(ni, ps_discard, discard); } ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#55 (text+ko) ==== @@ -513,6 +513,7 @@ const char *fmt, ...); #else #define IEEE80211_DPRINTF(_ic, _m, _fmt, ...) +#define IEEE80211_NOTE(_ic, _m, _ni, _fmt, ...) #define IEEE80211_NOTE_FRAME(_ic, _m, _wh, _fmt, ...) #define IEEE80211_NOTE_MAC(_ic, _m, _mac, _fmt, ...) #define ieee80211_msg_dumppkts(_ic) 0