From: Roy Marples <roy@marples.name>
Date: Thu, 18 Sep 2014 07:02:43 +0000 (+0000)
Subject: Fix compile on BSD
X-Git-Tag: v6.4.5~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=297870af0e4cec4ba3056cbcc38db83227dd7b51;p=thirdparty%2Fdhcpcd.git

Fix compile on BSD
---

diff --git a/if-bsd.c b/if-bsd.c
index 18f1b536..661c64f0 100644
--- 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 59d2010d..e4fedce5 100644
--- 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;