diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2011-01-21 17:42:58 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2011-01-21 17:42:58 +0000 |
| commit | cf8f13c9ac98892c33877f23715a9b90e15bcadc (patch) | |
| tree | 3bc9856438fb31d18bbd4169a4e63cbb017cf05d /sys/net | |
| parent | 81825332e44d97e53bb95b2c47b591a9cc30c793 (diff) | |
make mpls compile w/o errors when inet6 is not defined
diff from form@ who's too busy drinking vodka with pelmeni to commit this;
ok claudio
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_mpe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c index 965390fec42..f434e4af6fa 100644 --- a/sys/net/if_mpe.c +++ b/sys/net/if_mpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpe.c,v 1.23 2010/09/21 06:13:06 claudio Exp $ */ +/* $OpenBSD: if_mpe.c,v 1.24 2011/01/21 17:42:57 mikeb Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -71,7 +71,9 @@ struct if_clone mpe_cloner = IF_CLONE_INITIALIZER("mpe", mpe_clone_create, mpe_clone_destroy); extern int mpls_mapttl_ip; +#ifdef INET6 extern int mpls_mapttl_ip6; +#endif void mpeattach(int nmpe) @@ -408,6 +410,7 @@ mpe_input(struct mbuf *m, struct ifnet *ifp, struct sockaddr_mpls *smpls, splx(s); } +#ifdef INET6 void mpe_input6(struct mbuf *m, struct ifnet *ifp, struct sockaddr_mpls *smpls, u_int8_t ttl) @@ -441,6 +444,7 @@ mpe_input6(struct mbuf *m, struct ifnet *ifp, struct sockaddr_mpls *smpls, schednetisr(NETISR_IPV6); splx(s); } +#endif /* INET6 */ int mpe_newlabel(struct ifnet *ifp, int cmd, struct shim_hdr *shim) |