svn commit: r241922 - head/sys/netipsec

[Gleb Smirnoff]

Author: glebius
Date: Tue Oct 23 08:22:01 2012
New Revision: 241922
URL: http://svn.freebsd.org/changeset/base/241922

Log:
  - Fix one more miss from r241913.
  - Add XXX comment about necessity of the entire block,
    that "fixes up" the IP header.

Modified:
  head/sys/netipsec/ipsec_input.c

Modified: head/sys/netipsec/ipsec_input.c
==============================================================================
--- head/sys/netipsec/ipsec_input.c	Tue Oct 23 02:20:42 2012	(r241921)
+++ head/sys/netipsec/ipsec_input.c	Tue Oct 23 08:22:01 2012	(r241922)
@@ -328,7 +328,10 @@ ipsec4_common_input_cb(struct mbuf *m, s
 	}
 
 	if (skip != 0) {
-		/* Fix IPv4 header */
+		/*
+		 * Fix IPv4 header
+		 * XXXGL: do we need this entire block?
+		 */
 		if (m->m_len < skip && (m = m_pullup(m, skip)) == NULL) {
 			DPRINTF(("%s: processing failed for SA %s/%08lx\n",
 			    __func__, ipsec_address(&sav->sah->saidx.dst),
@@ -341,7 +344,6 @@ ipsec4_common_input_cb(struct mbuf *m, s
 
 		ip = mtod(m, struct ip *);
 		ip->ip_len = htons(m->m_pkthdr.len);
-		ip->ip_off = htons(ip->ip_off);
 		ip->ip_sum = 0;
 		ip->ip_sum = in_cksum(m, ip->ip_hl << 2);
 	} else {