svn commit: r274133 - in stable/9/sys: net netinet

[Andrey V. Elsukov]

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. */