Fix naming of interface flags

diff --git a/include/iface.h b/include/iface.h
index daeaf17..db0dec5 100644 (file)
--- a/include/iface.h
+++ b/include/iface.h
@@ -37,9 +37,9 @@ enum connman_iface_type {
 };
 
 enum connman_iface_flags {
-       CONNMAN_IFACE_FLAGS_CARRIER_DETECT      = (1 << 0),
-       CONNMAN_IFACE_FLAGS_IPV4                = (1 << 1),
-       CONNMAN_IFACE_FLAGS_IPV6                = (1 << 2),
+       CONNMAN_IFACE_FLAG_CARRIER_DETECT = (1 << 0),
+       CONNMAN_IFACE_FLAG_IPV4           = (1 << 1),
+       CONNMAN_IFACE_FLAG_IPV6           = (1 << 2),
 };
 
 struct connman_ipv4 {

diff --git a/plugins/80203.c b/plugins/80203.c
index e39fcdc..826dd81 100644 (file)
--- a/plugins/80203.c
+++ b/plugins/80203.c
@@ -43,8 +43,8 @@ static int iface_probe(struct connman_iface *iface)
 
        iface->type = CONNMAN_IFACE_TYPE_80203;
 
-       iface->flags = CONNMAN_IFACE_FLAGS_CARRIER_DETECT |
-                                               CONNMAN_IFACE_FLAGS_IPV4;
+       iface->flags = CONNMAN_IFACE_FLAG_CARRIER_DETECT |
+                                       CONNMAN_IFACE_FLAG_IPV4;
 
        __net_free(ifname);
 

diff --git a/plugins/80211.c b/plugins/80211.c
index 1fd5aaf..091a3a0 100644 (file)
--- a/plugins/80211.c
+++ b/plugins/80211.c
@@ -43,7 +43,7 @@ static int iface_probe(struct connman_iface *iface)
 
        iface->type = CONNMAN_IFACE_TYPE_80211;
 
-       iface->flags = CONNMAN_IFACE_FLAGS_IPV4;
+       iface->flags = CONNMAN_IFACE_FLAG_IPV4;
 
        __net_free(ifname);
 

diff --git a/src/iface.c b/src/iface.c
index 39de81d..69da8fe 100644 (file)
--- a/src/iface.c
+++ b/src/iface.c
@@ -117,7 +117,7 @@ static int probe_device(LibHalContext *ctx,
 
        interfaces = g_slist_append(interfaces, iface);
 
-       if ((iface->flags & CONNMAN_IFACE_FLAGS_IPV4) &&
+       if ((iface->flags & CONNMAN_IFACE_FLAG_IPV4) &&
                                                driver->get_ipv4) {
                driver->get_ipv4(iface, &iface->ipv4);