]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Fix compile on BSD
authorRoy Marples <roy@marples.name>
Thu, 18 Sep 2014 07:02:43 +0000 (07:02 +0000)
committerRoy Marples <roy@marples.name>
Thu, 18 Sep 2014 07:02:43 +0000 (07:02 +0000)
if-bsd.c
if.c

index 18f1b53646f6607c73e8b83e5cf9a0266e1e8987..661c64f052c5da2179cc592ba783d27ecf6b93a7 100644 (file)
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -1062,7 +1062,7 @@ if_checkipv6(struct dhcpcd_ctx *ctx, const struct interface *ifp, int own)
                if (del_if_nd6_flag(ifp->name, ND6_IFF_IFDISABLED) == -1) {
                        syslog(LOG_ERR,
                            "%s: del_if_nd6_flag: ND6_IFF_IFDISABLED: %m",
-                           ifname);
+                           ifp->name);
                        return -1;
                }
 #endif
@@ -1071,7 +1071,7 @@ if_checkipv6(struct dhcpcd_ctx *ctx, const struct interface *ifp, int own)
                if (set_if_nd6_flag(ifp->name, ND6_IFF_PERFORMNUD) == -1) {
                        syslog(LOG_ERR,
                            "%s: set_if_nd6_flag: ND6_IFF_PERFORMNUD: %m",
-                           ifname);
+                           ifp->name);
                        return -1;
                }
 #endif
diff --git a/if.c b/if.c
index 59d2010d6b1dceff17c6c3c6d3c786f67cbcb540..e4fedce5a887a5db45dd302c61a760911aaecd0b 100644 (file)
--- a/if.c
+++ b/if.c
@@ -478,7 +478,7 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
        return ifs;
 }
 
-struct interface *
+static struct interface *
 if_findindexname(struct dhcpcd_ctx *ctx, unsigned int idx, const char *name)
 {
        struct interface *ifp;