]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Fix compile
authorRoy Marples <roy@marples.name>
Wed, 18 May 2016 19:41:19 +0000 (19:41 +0000)
committerRoy Marples <roy@marples.name>
Wed, 18 May 2016 19:41:19 +0000 (19:41 +0000)
if-bsd.c

index 2d8bd9f940064aa376c2835c0b7c257b0be47a4c..1682f27ec9b064a02a57ca08ed3969a77c4b21ec 100644 (file)
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -531,13 +531,13 @@ next:
 
 
 int
-if_address(unsigned char cmd, struct ipv4_addr *ia)
+if_address(unsigned char cmd, const struct ipv4_addr *ia)
 {
        int r;
        struct in_aliasreq ifra;
 
        memset(&ifra, 0, sizeof(ifra));
-       strlcpy(ifra.ifra_name, ifp->name, sizeof(ifra.ifra_name));
+       strlcpy(ifra.ifra_name, ia->iface->name, sizeof(ifra.ifra_name));
 
 #define ADDADDR(var, addr) do {                                                      \
                (var)->sin_family = AF_INET;                                  \
@@ -550,7 +550,7 @@ if_address(unsigned char cmd, struct ipv4_addr *ia)
                ADDADDR(&ifra.ifra_broadaddr, &ia->brd);
 #undef ADDADDR
 
-       r = ioctl(ifp->ctx->pf_inet_fd,
+       r = ioctl(ia->iface->ctx->pf_inet_fd,
            cmd == RTM_DELADDR ? SIOCDIFADDR : SIOCAIFADDR, &ifra);
        return r;
 }
@@ -823,10 +823,11 @@ if_addrflags(const struct in_addr *addr, const struct interface *ifp)
                return -1;
        return ifr.ifr_addrflags;
 #else
-       UNUSED(ia);
+       UNUSED(addr);
+       UNUSED(ifp);
+       return 0;
 #endif
 }
-#endif
 #endif /* INET */
 
 #ifdef INET6