From owner-p4-projects@FreeBSD.ORG Sun Oct 21 13:06:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 098AF16A418; Sun, 21 Oct 2007 13:06:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79C0116A420 for ; Sun, 21 Oct 2007 13:06:30 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 47A1613C48D for ; Sun, 21 Oct 2007 13:06:30 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9LD6U4g072668 for ; Sun, 21 Oct 2007 13:06:30 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9LD6U2m072665 for perforce@freebsd.org; Sun, 21 Oct 2007 13:06:30 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 21 Oct 2007 13:06:30 GMT Message-Id: <200710211306.l9LD6U2m072665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127889 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: Sun, 21 Oct 2007 13:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=127889 Change 127889 by zec@zec_tpx32 on 2007/10/21 13:05:36 Prevent benign yet annoying vnet stacking messages from being printed on console on 802.11 ifnet state changes. Affected files ... .. //depot/projects/vimage/src/sys/net/rtsock.c#10 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#5 edit Differences ... ==== //depot/projects/vimage/src/sys/net/rtsock.c#10 (text+ko) ==== @@ -1036,9 +1036,7 @@ if (m->m_flags & M_PKTHDR) m->m_pkthdr.len += data_len; mtod(m, struct if_announcemsghdr *)->ifan_msglen += data_len; - CURVNET_SET(ifp->if_vnet); rt_dispatch(m, NULL); - CURVNET_RESTORE(); } } ==== //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#5 (text+ko) ==== @@ -26,6 +26,8 @@ #include __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.16 2007/08/26 11:32:56 sephe Exp $"); +#include "opt_vimage.h" + /* * IEEE 802.11 support (FreeBSD-specific code) */ @@ -37,8 +39,8 @@ #include #include #include - #include +#include #include #include @@ -275,6 +277,7 @@ struct ifnet *ifp = ic->ic_ifp; struct ieee80211_join_event iev; + CURVNET_SET(ifp->if_vnet); memset(&iev, 0, sizeof(iev)); if (ni == ic->ic_bss) { IEEE80211_ADDR_COPY(iev.iev_addr, ni->ni_bssid); @@ -288,6 +291,7 @@ RTM_IEEE80211_JOIN : RTM_IEEE80211_REJOIN, &iev, sizeof(iev)); } + CURVNET_RESTORE(); } void @@ -296,6 +300,7 @@ struct ifnet *ifp = ic->ic_ifp; struct ieee80211_leave_event iev; + CURVNET_SET_QUIET(ifp->if_vnet); if (ni == ic->ic_bss) { rt_ieee80211msg(ifp, RTM_IEEE80211_DISASSOC, NULL, 0); if_link_state_change(ifp, LINK_STATE_DOWN); @@ -305,6 +310,7 @@ IEEE80211_ADDR_COPY(iev.iev_addr, ni->ni_macaddr); rt_ieee80211msg(ifp, RTM_IEEE80211_LEAVE, &iev, sizeof(iev)); } + CURVNET_RESTORE(); } void @@ -315,7 +321,9 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN, "%s\n", "notify scan done"); /* dispatch wireless event indicating scan completed */ + CURVNET_SET(ifp->if_vnet); rt_ieee80211msg(ifp, RTM_IEEE80211_SCAN, NULL, 0); + CURVNET_RESTORE(); } void @@ -343,7 +351,9 @@ iev.iev_keyix = k->wk_keyix; iev.iev_keyrsc = k->wk_keyrsc; iev.iev_rsc = rsc; + CURVNET_SET(ifp->if_vnet); rt_ieee80211msg(ifp, RTM_IEEE80211_REPLAY, &iev, sizeof(iev)); + CURVNET_RESTORE(); } } @@ -365,7 +375,9 @@ IEEE80211_ADDR_COPY(iev.iev_src, wh->i_addr2); iev.iev_cipher = IEEE80211_CIPHER_TKIP; iev.iev_keyix = keyix; + CURVNET_SET(ifp->if_vnet); rt_ieee80211msg(ifp, RTM_IEEE80211_MICHAEL, &iev, sizeof(iev)); + CURVNET_RESTORE(); } }