svn commit: r243601 - head/sys/net

[Gleb Smirnoff]

Author: glebius
Date: Tue Nov 27 06:35:26 2012
New Revision: 243601
URL: http://svnweb.freebsd.org/changeset/base/243601

Log:
    Better safe than sorry: reinitialize eh after ng_ether(4) and
  if_bridge(4) processing, since mbuf may be modified there.
  
  Submitted by:	youngari

Modified:
  head/sys/net/if_ethersubr.c

Modified: head/sys/net/if_ethersubr.c
==============================================================================
--- head/sys/net/if_ethersubr.c	Tue Nov 27 06:20:40 2012	(r243600)
+++ head/sys/net/if_ethersubr.c	Tue Nov 27 06:35:26 2012	(r243601)
@@ -593,6 +593,7 @@ ether_input_internal(struct ifnet *ifp, 
 			CURVNET_RESTORE();
 			return;
 		}
+		eh = mtod(m, struct ether_header *);
 	}
 
 	/*
@@ -607,6 +608,7 @@ ether_input_internal(struct ifnet *ifp, 
 			CURVNET_RESTORE();
 			return;
 		}
+		eh = mtod(m, struct ether_header *);
 	}
 
 #if defined(INET) || defined(INET6)