diff options
| author | kris <kris@FreeBSD.org> | 2000-07-20 00:35:37 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-07-20 00:35:37 +0000 |
| commit | c2e76f6679a3f27f42a10c666ec6bc697b39a20e (patch) | |
| tree | 30e5faaf4094263bb8c8e443f8bceead69564075 /sys | |
| parent | c4d081a80705cef90cebf1fbf6b6c63708cbe00d (diff) | |
| download | FreeBSD-src-c2e76f6679a3f27f42a10c666ec6bc697b39a20e.zip FreeBSD-src-c2e76f6679a3f27f42a10c666ec6bc697b39a20e.tar.gz | |
Temporary hack for the benefit of the X-Bone project
(http://www.isi.edu/xbone). I expect this to go away in due course.
Submitted by: Lars Eggert <larse@ISI.EDU>
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/NOTES | 1 | ||||
| -rw-r--r-- | sys/conf/options | 1 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 1 | ||||
| -rw-r--r-- | sys/net/if_gif.c | 2 |
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) \ |
