diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2010-02-02 16:27:50 +0100 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2010-02-02 08:37:13 -0800 |
commit | 41808862dc642a1bad8df65e0bbd0046b585fa93 (patch) | |
tree | 74df4a36b32a8547cbaba4b454ff3ad140859e7e | |
parent | cec618e31bd2dd646f5c44791c4f131b722285a5 (diff) | |
download | connman-41808862dc642a1bad8df65e0bbd0046b585fa93.tar.gz connman-41808862dc642a1bad8df65e0bbd0046b585fa93.tar.bz2 connman-41808862dc642a1bad8df65e0bbd0046b585fa93.zip |
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.
-rw-r--r-- | include/inet.h | 2 | ||||
-rw-r--r-- | plugins/supplicant.c | 8 | ||||
-rw-r--r-- | src/inet.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/inet.h b/include/inet.h index 0d88b536..2b9a7df5 100644 --- 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 ed176ed1..535f1d3f 100644 --- 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)); @@ -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]; |