summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/conf/NOTES1
-rw-r--r--sys/conf/options1
-rw-r--r--sys/i386/conf/NOTES1
-rw-r--r--sys/net/if_gif.c2
4 files changed, 5 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index cf1a4aa..a3fca85 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2497,3 +2497,4 @@ options VFS_BIO_DEBUG
options VM_KMEM_SIZE
options VM_KMEM_SIZE_MAX
options VM_KMEM_SIZE_SCALE
+options XBONEHACK
diff --git a/sys/conf/options b/sys/conf/options
index 0ee2c9f..dac7f80 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -265,6 +265,7 @@ TCP_COMPAT_42 opt_compat.h
TCPDEBUG
TCP_DROP_SYNFIN opt_tcp_input.h
TCP_RESTRICT_RST opt_tcp_input.h
+XBONEHACK
# Netgraph(4). Use option NETGRAPH to enable the base netgraph code.
# Each netgraph node type can be either be compiled into the kernel
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index cf1a4aa..a3fca85 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2497,3 +2497,4 @@ options VFS_BIO_DEBUG
options VM_KMEM_SIZE
options VM_KMEM_SIZE_MAX
options VM_KMEM_SIZE_SCALE
+options XBONEHACK
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 0337a61..085ff3d 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -470,12 +470,14 @@ gif_ioctl(ifp, cmd, data)
sc2->gif_psrc->sa_family != src->sa_family ||
sc2->gif_psrc->sa_len != src->sa_len)
continue;
+#ifndef XBONEHACK
/* can't configure same pair of address onto two gifs */
if (bcmp(sc2->gif_pdst, dst, dst->sa_len) == 0 &&
bcmp(sc2->gif_psrc, src, src->sa_len) == 0) {
error = EADDRNOTAVAIL;
goto bad;
}
+#endif
/* can't configure multiple multi-dest interfaces */
#define multidest(x) \
OpenPOWER on IntegriCloud