summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2002-07-22 15:51:02 +0000
committerume <ume@FreeBSD.org>2002-07-22 15:51:02 +0000
commitcd3f29ae66aa80d1901c45d70d4eff79ce3ad9e1 (patch)
tree8d23443ebd8b87dc7e720e9a2467b2940776044f
parent73d7a388d6e5a327350fd65e9e3b70ffff9e4ac9 (diff)
downloadFreeBSD-src-cd3f29ae66aa80d1901c45d70d4eff79ce3ad9e1.zip
FreeBSD-src-cd3f29ae66aa80d1901c45d70d4eff79ce3ad9e1.tar.gz
do not refer to IN6P_BINDV6ONLY anymore.
Obtained from: KAME MFC after: 1 week
-rw-r--r--sys/netinet/in_pcb.h1
-rw-r--r--sys/netinet6/ip6_output.c8
2 files changed, 1 insertions, 8 deletions
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 1d9a21d..d4d049c 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -283,7 +283,6 @@ struct inpcbinfo { /* XXX documentation, prefixes */
#define IN6P_RTHDR 0x100000 /* receive routing header */
#define IN6P_RTHDRDSTOPTS 0x200000 /* receive dstoptions before rthdr */
#define IN6P_AUTOFLOWLABEL 0x800000 /* attach flowlabel automatically */
-#define IN6P_BINDV6ONLY 0x10000000 /* do not grab IPv4 traffic */
#define INP_CONTROLOPTS (INP_RECVOPTS|INP_RECVRETOPTS|INP_RECVDSTADDR|\
INP_RECVIF|\
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 73ae5cd..08ef3d8 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1376,11 +1376,6 @@ do { \
error = EINVAL;
break;
}
- /*
- * XXX: BINDV6ONLY should be integrated
- * into V6ONLY.
- */
- OPTSET(IN6P_BINDV6ONLY);
OPTSET(IN6P_IPV6_V6ONLY);
break;
}
@@ -1568,8 +1563,7 @@ do { \
break;
case IPV6_V6ONLY:
- /* XXX: see the setopt case. */
- optval = OPTBIT(IN6P_BINDV6ONLY);
+ optval = OPTBIT(IN6P_IPV6_V6ONLY);
break;
case IPV6_PORTRANGE:
OpenPOWER on IntegriCloud