From owner-svn-src-stable@FreeBSD.ORG  Mon Jun 24 09:00:19 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 47D4C17D;
 Mon, 24 Jun 2013 09:00:19 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3A65C1763;
 Mon, 24 Jun 2013 09:00:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5O90J7Y004737;
 Mon, 24 Jun 2013 09:00:19 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5O90Jau004735;
 Mon, 24 Jun 2013 09:00:19 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201306240900.r5O90Jau004735@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 24 Jun 2013 09:00:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252145 - stable/9/sys/net
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jun 2013 09:00:19 -0000

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)