kern/165643: commit references a PR

[dfilter service]

The following reply was made to PR kern/165643; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: kern/165643: commit references a PR
Date: Wed, 28 Mar 2012 12:41:36 +0000 (UTC)

 Author: zec
 Date: Wed Mar 28 12:41:17 2012
 New Revision: 233603
 URL: http://svn.freebsd.org/changeset/base/233603
 
 Log:
   MFC 232487:
     Properly restore curvnet context when returning early from
     ether_input_internal().
   
     This change only affects options VIMAGE kernel builds.
   
     PR:           kern/165643
     Submitted by: Vijay Singh
     MFC after:    3 days
 
 Modified:
   stable/8/sys/net/if_ethersubr.c
 Directory Properties:
   stable/8/sys/   (props changed)
   stable/8/sys/amd64/include/xen/   (props changed)
   stable/8/sys/boot/   (props changed)
   stable/8/sys/cddl/contrib/opensolaris/   (props changed)
   stable/8/sys/contrib/dev/acpica/   (props changed)
   stable/8/sys/contrib/pf/   (props changed)
   stable/8/sys/dev/e1000/   (props changed)
   stable/8/sys/i386/conf/XENHVM   (props changed)
 
 Modified: stable/8/sys/net/if_ethersubr.c
 ==============================================================================
 --- stable/8/sys/net/if_ethersubr.c	Wed Mar 28 12:40:30 2012	(r233602)
 +++ stable/8/sys/net/if_ethersubr.c	Wed Mar 28 12:41:17 2012	(r233603)
 @@ -660,8 +660,10 @@ ether_input(struct ifnet *ifp, struct mb
  		m = (*lagg_input_p)(ifp, m);
  		if (m != NULL)
  			ifp = m->m_pkthdr.rcvif;
 -		else 
 +		else {
 +			CURVNET_RESTORE();
  			return;
 +		}
  	}
  
  	/*
 @@ -680,6 +682,7 @@ ether_input(struct ifnet *ifp, struct mb
  #endif
  			ifp->if_ierrors++;
  			m_freem(m);
 +			CURVNET_RESTORE();
  			return;
  		}
  
 _______________________________________________
 svn-src-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"