Module Name: src
Committed By: snj
Date: Sat Sep 23 17:28:41 UTC 2017
Modified Files:
src/sys/external/bsd/ipf/netinet [netbsd-8]: fil.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #283):
sys/external/bsd/ipf/netinet/fil.c: revision 1.21
Revert changing the byte order of fi->fi_addr. It is already correct. From
Timo Buhrmester
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.4.1 src/sys/external/bsd/ipf/netinet/fil.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/ipf/netinet/fil.c
diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.20 src/sys/external/bsd/ipf/netinet/fil.c:1.20.4.1
--- src/sys/external/bsd/ipf/netinet/fil.c:1.20 Sun Apr 23 20:47:22 2017
+++ src/sys/external/bsd/ipf/netinet/fil.c Sat Sep 23 17:28:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fil.c,v 1.20 2017/04/23 20:47:22 christos Exp $ */
+/* $NetBSD: fil.c,v 1.20.4.1 2017/09/23 17:28:41 snj Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@ extern struct timeout ipf_slowtimer_ch;
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.20 2017/04/23 20:47:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.20.4.1 2017/09/23 17:28:41 snj Exp $");
#else
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
@@ -1709,7 +1709,7 @@ ipf_pr_ipv4hdr(fr_info_t *fin)
fin->fin_crc += fi->fi_saddr;
fi->fi_daddr = ip->ip_dst.s_addr;
fin->fin_crc += fi->fi_daddr;
- if (IN_CLASSD(ntohl(fi->fi_daddr)))
+ if (IN_CLASSD(fi->fi_daddr))
fin->fin_flx |= FI_MULTICAST|FI_MBCAST;
/*
