Rename mac80211 routines and fields to cfg80211

The mac80211 boolean and inet routines names are a bit misleading since
what we really want to check is if the underlying wifi driver is cfg80211
compliant. The mac80211 drivers form a subset of that, as some full MAC
cards also are fully cfg80211 compliant.

diff --git a/include/inet.h b/include/inet.h
index 0d88b536861449cf3eb351fd0a9a9a89957ca0c9..2b9a7df518fe6262dc8439da1fb1e6df83c92da9 100644 (file)
--- a/include/inet.h
+++ b/include/inet.h
@@ -40,7 +40,7 @@ int connman_inet_ifup(int index);
 int connman_inet_ifdown(int index);
 
 struct connman_device *connman_inet_create_device(int index);
-connman_bool_t connman_inet_is_mac80211(int index);
+connman_bool_t connman_inet_is_cfg80211(int index);
 
 int connman_inet_set_address(int index, struct connman_ipaddress *ipaddress);
 int connman_inet_clear_address(int index);

diff --git a/plugins/supplicant.c b/plugins/supplicant.c
index ed176ed1bce84aa4e6628a5dcfd57335915fa70d..535f1d3f30a238dea71a37fee2f99133f8f84234 100644 (file)
--- a/plugins/supplicant.c
+++ b/plugins/supplicant.c
@@ -177,7 +177,7 @@ struct supplicant_result {
 struct supplicant_task {
        int ifindex;
        char *ifname;
-       gboolean mac80211;
+       gboolean cfg80211;
        struct connman_device *device;
        struct connman_network *network;
        struct connman_network *pending_network;
@@ -988,7 +988,7 @@ static int set_network(struct supplicant_task *task,
                const char *auth_alg = "OPEN";
                const char *key_index = "0";
 
-               if (task->mac80211 == TRUE)
+               if (task->cfg80211 == TRUE)
                        auth_alg = "OPEN SHARED";
 
                connman_dbus_dict_append_basic(&dict, "auth_alg",
@@ -2004,8 +2004,8 @@ int supplicant_start(struct connman_device *device)
                goto failed;
        }
 
-       task->mac80211 = connman_inet_is_mac80211(task->ifindex);
-       if (task->mac80211 == FALSE)
+       task->cfg80211 = connman_inet_is_cfg80211(task->ifindex);
+       if (task->cfg80211 == FALSE)
                connman_warn("Enabling quirks for unsupported driver");
 
        task->range = g_try_malloc0(sizeof(struct iw_range));

diff --git a/src/inet.c b/src/inet.c
index ee84f2b06cd18ac44ae66f705103373e8f72d640..583800825943d7d1438a0df1b5a1f9de1b866e1a 100644 (file)
--- a/src/inet.c
+++ b/src/inet.c
@@ -318,7 +318,7 @@ static char *index2ident(int index, const char *prefix)
        return str;
 }
 
-connman_bool_t connman_inet_is_mac80211(int index)
+connman_bool_t connman_inet_is_cfg80211(int index)
 {
        connman_bool_t result = FALSE;
        char phy80211_path[PATH_MAX];