diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
| commit | b58ed1f8a89ea32c2380bf79057e5333109d72d4 (patch) | |
| tree | a9ead45b8895edce92ab69621a52816b45725e36 /zebra/ipforward_solaris.c | |
| parent | 01cb1466423363a2f8b42246464feb3858df1c9f (diff) | |
| parent | 5551c072e187c76c3d6a885cd043d6db811bab23 (diff) | |
Merge remote-tracking branch 'origin/master' into pim_lib_work2
Diffstat (limited to 'zebra/ipforward_solaris.c')
| -rw-r--r-- | zebra/ipforward_solaris.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/zebra/ipforward_solaris.c b/zebra/ipforward_solaris.c index 4aa1b797af..8eccfe133c 100644 --- a/zebra/ipforward_solaris.c +++ b/zebra/ipforward_solaris.c @@ -145,7 +145,6 @@ ipforward_off (void) (void) solaris_nd_set("ip_forwarding", 0); return ipforward(); } -#ifdef HAVE_IPV6 int ipforward_ipv6(void) { return solaris_nd_get("ip6_forwarding"); @@ -162,4 +161,3 @@ ipforward_ipv6_off (void) (void) solaris_nd_set("ip6_forwarding", 0); return ipforward_ipv6(); } -#endif /* HAVE_IPV6 */ |