[src/netbsd-3-0]: src/sys/netinet Pull up following revision(s) (requested by...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5a5df5d1fc03
branches:  netbsd-3-0
changeset: 579375:5a5df5d1fc03
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Jan 28 19:39:30 2007 +0000

description:
Pull up following revision(s) (requested by yamt in ticket #1656):
        sys/netinet/ip_output.c: revision 1.173
ip_output: reload ip_len after running pfil_run_hooks.
pf "fragment reassemble" rule can change it, at least.

diffstat:

 sys/netinet/ip_output.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 62732efc5cd1 -r 5a5df5d1fc03 sys/netinet/ip_output.c
--- a/sys/netinet/ip_output.c   Fri Jan 19 21:43:28 2007 +0000
+++ b/sys/netinet/ip_output.c   Sun Jan 28 19:39:30 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_output.c,v 1.149.2.3 2005/10/21 18:55:52 riz Exp $  */
+/*     $NetBSD: ip_output.c,v 1.149.2.3.2.1 2007/01/28 19:39:30 tron Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.149.2.3 2005/10/21 18:55:52 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.149.2.3.2.1 2007/01/28 19:39:30 tron Exp $");
 
 #include "opt_pfil_hooks.h"
 #include "opt_inet.h"
@@ -786,6 +786,7 @@
 
        ip = mtod(m, struct ip *);
        hlen = ip->ip_hl << 2;
+       ip_len = ntohs(ip->ip_len);
 #endif /* PFIL_HOOKS */
 
        m->m_pkthdr.csum_data |= hlen << 16;