summaryrefslogtreecommitdiffstats
path: root/net.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2014-03-27 22:14:52 +0000
committerRoy Marples <roy@marples.name>2014-03-27 22:14:52 +0000
commit34457fe661b5d33b5b5ccc0ca2b4b6dd517ef98e (patch)
tree343bd9a0da3bc73ece27fb12c7d0ccd294485cb4 /net.c
parent026bfbf02468d79ba5b9c4273604c9322c275bf8 (diff)
downloaddhcpcd-34457fe661b5d33b5b5ccc0ca2b4b6dd517ef98e.tar.xz
Add -Wconversion to debug CFLAGS and fix fallout.
Diffstat (limited to 'net.c')
-rw-r--r--net.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net.c b/net.c
index 6e269a0e..96f1b0bd 100644
--- a/net.c
+++ b/net.c
@@ -179,7 +179,7 @@ carrier_status(struct interface *iface)
close(s);
return LINK_UNKNOWN;
}
- iface->flags = ifr.ifr_flags;
+ iface->flags = (unsigned int)ifr.ifr_flags;
r = LINK_UNKNOWN;
#ifdef SIOCGIFMEDIA
@@ -222,7 +222,7 @@ up_interface(struct interface *iface)
if (ioctl(s, SIOCSIFFLAGS, &ifr) == 0)
r = 0;
}
- iface->flags = ifr.ifr_flags;
+ iface->flags = (unsigned int)ifr.ifr_flags;
}
close(s);
return r;
@@ -233,7 +233,8 @@ discover_interfaces(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
{
struct ifaddrs *ifaddrs, *ifa;
char *p;
- int i, sdl_type;
+ int i;
+ sa_family_t sdl_type;
struct if_head *ifs;
struct interface *ifp;
#ifdef __linux__
@@ -425,7 +426,7 @@ discover_interfaces(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
memcpy(ifp->hwaddr, CLLADDR(sdl), ifp->hwlen);
#elif AF_PACKET
sll = (const struct sockaddr_ll *)(void *)ifa->ifa_addr;
- ifp->index = sll->sll_ifindex;
+ ifp->index = (unsigned int)sll->sll_ifindex;
ifp->family = sdl_type = sll->sll_hatype;
ifp->hwlen = sll->sll_halen;
if (ifp->hwlen != 0)