Author: dim
Date: Wed Feb 19 07:51:58 2014
New Revision: 262210
URL: http://svnweb.freebsd.org/changeset/base/262210
Log:
MFC r261915:
Under sys/netpfil/ipfw, surround two IPv6-specific static functions with
#ifdef INET6, since they are unused when INET6 is disabled.
Modified:
stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c
stable/9/sys/netpfil/ipfw/ip_fw_table.c
Directory Properties:
stable/9/sys/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/sys/netpfil/ipfw/ip_fw_dynamic.c
stable/10/sys/netpfil/ipfw/ip_fw_table.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c
==============================================================================
--- stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c Wed Feb 19 07:09:14 2014
(r262209)
+++ stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c Wed Feb 19 07:51:58 2014
(r262210)
@@ -231,6 +231,7 @@ SYSEND
#endif /* SYSCTL_NODE */
+#ifdef INET6
static __inline int
hash_packet6(struct ipfw_flow_id *id)
{
@@ -242,6 +243,7 @@ hash_packet6(struct ipfw_flow_id *id)
(id->dst_port) ^ (id->src_port);
return i;
}
+#endif
/*
* IMPORTANT: the hash function for dynamic rules must be commutative
Modified: stable/9/sys/netpfil/ipfw/ip_fw_table.c
==============================================================================
--- stable/9/sys/netpfil/ipfw/ip_fw_table.c Wed Feb 19 07:09:14 2014
(r262209)
+++ stable/9/sys/netpfil/ipfw/ip_fw_table.c Wed Feb 19 07:51:58 2014
(r262210)
@@ -123,6 +123,7 @@ struct table_xentry {
#define OFF_LEN_IFACE (8 * offsetof(struct xaddr_iface, ifname))
+#ifdef INET6
static inline void
ipv6_writemask(struct in6_addr *addr6, uint8_t mask)
{
@@ -132,6 +133,7 @@ ipv6_writemask(struct in6_addr *addr6, u
*cp++ = 0xFFFFFFFF;
*cp = htonl(mask ? ~((1 << (32 - mask)) - 1) : 0);
}
+#endif
int
ipfw_add_table_entry(struct ip_fw_chain *ch, uint16_t tbl, void *paddr,
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
