From owner-freebsd-net@FreeBSD.ORG  Fri Mar  2 18:55:46 2012
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
Delivered-To: net@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 270261065808
	for <net@freebsd.org>; Fri,  2 Mar 2012 18:55:46 +0000 (UTC)
	(envelope-from vijju.singh@gmail.com)
Received: from mail-vx0-f182.google.com (mail-vx0-f182.google.com
	[209.85.220.182])
	by mx1.freebsd.org (Postfix) with ESMTP id C8D308FC1A
	for <net@freebsd.org>; Fri,  2 Mar 2012 18:55:45 +0000 (UTC)
Received: by vcmm1 with SMTP id m1so555317vcm.13
	for <net@freebsd.org>; Fri, 02 Mar 2012 10:55:45 -0800 (PST)
Received-SPF: pass (google.com: domain of vijju.singh@gmail.com designates
	10.52.178.40 as permitted sender) client-ip=10.52.178.40; 
Authentication-Results: mr.google.com;
	spf=pass (google.com: domain of vijju.singh@gmail.com
	designates 10.52.178.40 as permitted sender)
	smtp.mail=vijju.singh@gmail.com;
	dkim=pass header.i=vijju.singh@gmail.com
Received: from mr.google.com ([10.52.178.40])
	by 10.52.178.40 with SMTP id cv8mr18616670vdc.82.1330714545153
	(num_hops = 1); Fri, 02 Mar 2012 10:55:45 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=mime-version:date:message-id:subject:from:to:cc:content-type;
	bh=sQrIQgLbGbljjr9uuOPMRTWFInHb1CGbLaimeRFTUP4=;
	b=GyUR2ktsEhJTptS9Rng+BvZAaNW6sTkkfVBGmabUpGRpGZwvv/+Q3q9NrRqJln2sp/
	w0KakC+d1s4f0361tbEaE9YUj+Fn9pGv25EwKOtNy30++zhYmNdbsffxHoKhcUvQA9HT
	gfoExlPuFYUnmvIgOjx5I+79UwPqY+5EZRDgGq/axa0K1BR0X7aRiHp2Krg3uQ0TN1eC
	LJjWWdzxxz4Ik1K7Lvah+wZVPS64e4ykoiVgr3N4H9p395mUj/6uLEs86j8Kp21Mk+vq
	LnWdGhJEFOWfojH57YN2WyN0qWjknYiM/uMd6kk7J2b/h8dyhF4FditxbU0ktMM6xgEm
	PQwQ==
MIME-Version: 1.0
Received: by 10.52.178.40 with SMTP id cv8mr15706351vdc.82.1330712902788; Fri,
	02 Mar 2012 10:28:22 -0800 (PST)
Received: by 10.220.179.131 with HTTP; Fri, 2 Mar 2012 10:28:22 -0800 (PST)
Date: Fri, 2 Mar 2012 10:28:22 -0800
Message-ID: <CALCNsJSOpmGKtN5yJiLuCMpVz8z+t8EV=j+MUtyR4t-cRRTJ6g@mail.gmail.com>
From: Vijay Singh <vijju.singh@gmail.com>
To: net@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
Cc: 
Subject: Patch to restore vnet at a couple of places
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 18:55:46 -0000

Patch is against 9-stable.

[pc20 /u/vijay/bsd/CODE/9s/sys]# svn diff net/if_ethersubr.c
Index: net/if_ethersubr.c
===================================================================
--- net/if_ethersubr.c  (revision 232242)
+++ net/if_ethersubr.c  (working copy)
@@ -661,8 +661,10 @@
               m = (*lagg_input_p)(ifp, m);
               if (m != NULL)
                       ifp = m->m_pkthdr.rcvif;
-               else
+               else {
+                       CURVNET_RESTORE();
                       return;
+               }
       }

       /*
@@ -681,6 +683,7 @@
 #endif
                       ifp->if_ierrors++;
                       m_freem(m);
+                       CURVNET_RESTORE();
                       return;
               }

-vijay