diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2007-02-15 22:45:10 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2007-02-15 22:45:10 +0000 |
| commit | 4e68b6de7d30cd4be875346742ca436aa5081985 (patch) | |
| tree | 51180db66ffb3809b7505c55940044e94c8e2cca | |
| parent | 29429d311ea5bbc326b8dfa9132a3b4f68b5a551 (diff) | |
Simplify the #if NBRIDGE case as in in_gif.c:1.33.
| -rw-r--r-- | sys/netinet6/in6_gif.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index b64a6d34367..4e273aa3136 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_gif.c,v 1.23 2007/02/10 15:34:22 claudio Exp $ */ +/* $OpenBSD: in6_gif.c,v 1.24 2007/02/15 22:45:09 claudio Exp $ */ /* $KAME: in6_gif.c,v 1.43 2001/01/22 07:27:17 itojun Exp $ */ /* @@ -124,22 +124,13 @@ in6_gif_output(ifp, family, m) return EAFNOSUPPORT; } + /* encapsulate into IPv6 packet */ + mp = NULL; #if NBRIDGE > 0 - if (family == AF_LINK) { - mp = NULL; + if (family == AF_LINK) error = etherip_output(m, &tdb, &mp, 0, 0); - if (error) - return error; - else if (mp == NULL) - return EFAULT; - - m = mp; - goto sendit; - } + else #endif /* NBRIDGE */ - - /* encapsulate into IPv6 packet */ - mp = NULL; error = ipip_output(m, &tdb, &mp, 0, 0); if (error) return error; @@ -148,9 +139,6 @@ in6_gif_output(ifp, family, m) m = mp; -#if NBRIDGE > 0 - sendit: -#endif /* NBRIDGE */ /* See if out cached route remains the same */ if (dst->sin6_family != sin6_dst->sin6_family || !IN6_ARE_ADDR_EQUAL(&dst->sin6_addr, &sin6_dst->sin6_addr)) { |