From owner-svn-src-head@FreeBSD.ORG  Tue Jun  7 20:46:03 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F1E21065675;
	Tue,  7 Jun 2011 20:46:03 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F97E8FC12;
	Tue,  7 Jun 2011 20:46:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p57Kk3lZ099719;
	Tue, 7 Jun 2011 20:46:03 GMT (envelope-from zec@svn.freebsd.org)
Received: (from zec@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p57Kk3TC099716;
	Tue, 7 Jun 2011 20:46:03 GMT (envelope-from zec@svn.freebsd.org)
Message-Id: <201106072046.p57Kk3TC099716@svn.freebsd.org>
From: Marko Zec <zec@FreeBSD.org>
Date: Tue, 7 Jun 2011 20:46:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222834 - head/sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jun 2011 20:46:03 -0000

Author: zec
Date: Tue Jun  7 20:46:03 2011
New Revision: 222834
URL: http://svn.freebsd.org/changeset/base/222834

Log:
  Set curvnet context in a callout-trigerred code path.
  
  MFC after:	3 days

Modified:
  head/sys/net/bridgestp.c
  head/sys/net/bridgestp.h

Modified: head/sys/net/bridgestp.c
==============================================================================
--- head/sys/net/bridgestp.c	Tue Jun  7 19:39:34 2011	(r222833)
+++ head/sys/net/bridgestp.c	Tue Jun  7 20:46:03 2011	(r222834)
@@ -1860,6 +1860,8 @@ bstp_tick(void *arg)
 	if (bs->bs_running == 0)
 		return;
 
+	CURVNET_SET(bs->bs_vnet);
+
 	/* slow timer to catch missed link events */
 	if (bstp_timer_expired(&bs->bs_link_timer)) {
 		LIST_FOREACH(bp, &bs->bs_bplist, bp_next)
@@ -1893,6 +1895,8 @@ bstp_tick(void *arg)
 			bp->bp_txcount--;
 	}
 
+	CURVNET_RESTORE();
+
 	callout_reset(&bs->bs_bstpcallout, hz, bstp_tick, bs);
 }
 
@@ -2126,6 +2130,7 @@ bstp_attach(struct bstp_state *bs, struc
 	bs->bs_protover = BSTP_PROTO_RSTP;
 	bs->bs_state_cb = cb->bcb_state;
 	bs->bs_rtage_cb = cb->bcb_rtage;
+	bs->bs_vnet = curvnet;
 
 	getmicrotime(&bs->bs_last_tc_time);
 

Modified: head/sys/net/bridgestp.h
==============================================================================
--- head/sys/net/bridgestp.h	Tue Jun  7 19:39:34 2011	(r222833)
+++ head/sys/net/bridgestp.h	Tue Jun  7 20:46:03 2011	(r222834)
@@ -358,6 +358,7 @@ struct bstp_state {
 	LIST_HEAD(, bstp_port)	bs_bplist;
 	bstp_state_cb_t		bs_state_cb;
 	bstp_rtage_cb_t		bs_rtage_cb;
+	struct vnet		*bs_vnet;
 };
 
 #define	BSTP_LOCK_INIT(_bs)	mtx_init(&(_bs)->bs_mtx, "bstp", NULL, MTX_DEF)