svn commit: r252145 - stable/9/sys/net

[Gleb Smirnoff]

Author: glebius
Date: Mon Jun 24 09:00:18 2013
New Revision: 252145
URL: http://svnweb.freebsd.org/changeset/base/252145

Log:
  Merge r243569, r243601:
    Re-initialize eh pointer after m_adj(), after ng_ether(4) and
    if_bridge(4) processing.
  
    Submitted by: Kohji Okuno <okuno.kohji jp.panasonic.com>
    Reviewed by:  yongari

Modified:
  stable/9/sys/net/if_ethersubr.c
Directory Properties:
  stable/9/sys/net/   (props changed)

Modified: stable/9/sys/net/if_ethersubr.c
==============================================================================
--- stable/9/sys/net/if_ethersubr.c	Mon Jun 24 08:55:20 2013	(r252144)
+++ stable/9/sys/net/if_ethersubr.c	Mon Jun 24 09:00:18 2013	(r252145)
@@ -694,6 +694,7 @@ ether_input_internal(struct ifnet *ifp, 
 		bcopy((char *)evl, (char *)evl + ETHER_VLAN_ENCAP_LEN,
 		    ETHER_HDR_LEN - ETHER_TYPE_LEN);
 		m_adj(m, ETHER_VLAN_ENCAP_LEN);
+		eh = mtod(m, struct ether_header *);
 	}
 
 	M_SETFIB(m, ifp->if_fib);
@@ -708,6 +709,7 @@ ether_input_internal(struct ifnet *ifp, 
 			CURVNET_RESTORE();
 			return;
 		}
+		eh = mtod(m, struct ether_header *);
 	}
 
 	/*
@@ -722,6 +724,7 @@ ether_input_internal(struct ifnet *ifp, 
 			CURVNET_RESTORE();
 			return;
 		}
+		eh = mtod(m, struct ether_header *);
 	}
 
 #if defined(INET) || defined(INET6)