diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-10-06 05:52:02 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-10-06 05:52:02 +0000 |
| commit | 194b2a889f8375601e8d20f1a2d7232c98b11793 (patch) | |
| tree | 52970652315225fb716d6cbd21c3453e6c374ebb /sys/netinet6/in6.c | |
| parent | b0326669a61eb4f3cab4bea1b92f6f6f36782e4e (diff) | |
remove now-obsolete SIOCSIFPHY* handling in in{6,}_control.
sync with kame.
Diffstat (limited to 'sys/netinet6/in6.c')
| -rw-r--r-- | sys/netinet6/in6.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 29a16d30214..ddf14e82340 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,5 +1,5 @@ -/* $OpenBSD: in6.c,v 1.20 2000/07/12 05:18:56 itojun Exp $ */ -/* $KAME: in6.c,v 1.99 2000/07/11 17:00:58 jinmei Exp $ */ +/* $OpenBSD: in6.c,v 1.21 2000/10/06 05:52:01 itojun Exp $ */ +/* $KAME: in6.c,v 1.107 2000/10/06 04:58:30 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -81,10 +81,6 @@ #include <net/if.h> #include <net/if_types.h> #include <net/route.h> -#include "gif.h" -#if NGIF > 0 -#include <net/if_gif.h> -#endif #include <net/if_dl.h> #include <netinet/in.h> @@ -324,22 +320,6 @@ in6_control(so, cmd, data, ifp, p) if ((so->so_state & SS_PRIV) != 0) privileged++; - /* - * xxx should prevent processes for link-local addresses? - */ -#if NGIF > 0 - if (ifp && ifp->if_type == IFT_GIF) { - switch (cmd) { - case SIOCSIFPHYADDR_IN6: - if (!privileged) - return(EPERM); - /*fall through*/ - case SIOCGIFPSRCADDR_IN6: - case SIOCGIFPDSTADDR_IN6: - return gif_ioctl(ifp, cmd, data); - } - } -#endif switch (cmd) { case SIOCGETSGCNT_IN6: case SIOCGETMIFCNT_IN6: |