From owner-svn-src-all@FreeBSD.ORG  Wed Nov  5 09:33:03 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CACB3BE9;
 Wed,  5 Nov 2014 09:33:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B6E8CBD3;
 Wed,  5 Nov 2014 09:33:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA59X36B060514;
 Wed, 5 Nov 2014 09:33:03 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA59X3oq060510;
 Wed, 5 Nov 2014 09:33:03 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201411050933.sA59X3oq060510@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 5 Nov 2014 09:33:03 +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: r274133 - in stable/9/sys: net netinet
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Nov 2014 09:33:03 -0000

Author: ae
Date: Wed Nov  5 09:33:02 2014
New Revision: 274133
URL: https://svnweb.freebsd.org/changeset/base/274133

Log:
  Revert r273860. It breaks IPSEC in tunnel mode and needs more revisions to
  be merged before it will work as expected.

Modified:
  stable/9/sys/net/if_gif.c
  stable/9/sys/netinet/ip_gre.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/net/   (props changed)

Modified: stable/9/sys/net/if_gif.c
==============================================================================
--- stable/9/sys/net/if_gif.c	Wed Nov  5 09:23:29 2014	(r274132)
+++ stable/9/sys/net/if_gif.c	Wed Nov  5 09:33:02 2014	(r274133)
@@ -500,7 +500,6 @@ gif_input(m, af, ifp)
 	}
 	sc = ifp->if_softc;
 	m->m_pkthdr.rcvif = ifp;
-	m->m_flags &= ~(M_PROTOFLAGS);
 
 #ifdef MAC
 	mac_ifnet_create_mbuf(ifp, m);

Modified: stable/9/sys/netinet/ip_gre.c
==============================================================================
--- stable/9/sys/netinet/ip_gre.c	Wed Nov  5 09:23:29 2014	(r274132)
+++ stable/9/sys/netinet/ip_gre.c	Wed Nov  5 09:33:02 2014	(r274133)
@@ -211,7 +211,7 @@ gre_input2(struct mbuf *m ,int hlen, u_c
 	}
 
 	m->m_pkthdr.rcvif = GRE2IFP(sc);
-	m->m_flags &= ~(M_PROTOFLAGS);
+
 	netisr_queue(isr, m);
 
 	/* Packet is done, no further processing needed. */