diff options
| author | Bob Copeland <me@bobcopeland.com> | 2014-09-01 00:23:23 -0400 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2015-02-14 12:35:42 +0100 |
| commit | fbe23ec9a59712da3f126bf2b50d1906f1ad2f8a (patch) | |
| tree | ab62bc457da660e180da76e42b8a79329820fe39 | |
| parent | 1492f05d8873ff50a5d95e18cf280c4c028694f2 (diff) | |
| download | android_external_wpa_supplicant_8-fbe23ec9a59712da3f126bf2b50d1906f1ad2f8a.tar.gz android_external_wpa_supplicant_8-fbe23ec9a59712da3f126bf2b50d1906f1ad2f8a.tar.bz2 android_external_wpa_supplicant_8-fbe23ec9a59712da3f126bf2b50d1906f1ad2f8a.zip | |
nl80211: Add driver flag to indicate mesh support
Convert the driver flags variable to u64 since there was no room for
more flags.
Signed-off-by: Javier Lopez <jlopex@gmail.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Jason Mobarak <x@jason.mobarak.name>
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Conflicts:
src/drivers/driver.h
src/drivers/driver_nl80211.c
Git-commit: 24bd4e0be56ef0371a71f4749808a44b3aeffe16
Git-repo : git://w1.fi/srv/git/hostap.git
Change-Id: Ic4cc033fcc3eea368e32f230f37be96b713d1316
CRs-fixed: 752061
| -rw-r--r-- | src/drivers/driver.h | 4 | ||||
| -rw-r--r-- | src/drivers/driver_nl80211.c | 3 | ||||
| -rw-r--r-- | src/drivers/driver_wext.c | 5 | ||||
| -rw-r--r-- | wpa_supplicant/wpa_supplicant_i.h | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 7db0e835..e65d75f1 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1011,7 +1011,9 @@ struct wpa_driver_capa { #define WPA_DRIVER_FLAGS_QOS_MAPPING 0x40000000 /* Driver supports CSA in AP mode */ #define WPA_DRIVER_FLAGS_AP_CSA 0x80000000 - unsigned int flags; +/* Driver supports mesh */ +#define WPA_DRIVER_FLAGS_MESH 0x0000000100000000ULL + u64 flags; int max_scan_ssids; int max_sched_scan_ssids; diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 021fb17c..6c92500e 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -3500,6 +3500,9 @@ static void wiphy_info_supported_iftypes(struct wiphy_info_data *info, case NL80211_IFTYPE_AP: info->capa->flags |= WPA_DRIVER_FLAGS_AP; break; + case NL80211_IFTYPE_MESH_POINT: + info->capa->flags |= WPA_DRIVER_FLAGS_MESH; + break; case NL80211_IFTYPE_ADHOC: info->capa->flags |= WPA_DRIVER_FLAGS_IBSS; break; diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c index 459ac481..8d354244 100644 --- a/src/drivers/driver_wext.c +++ b/src/drivers/driver_wext.c @@ -1568,8 +1568,9 @@ static int wpa_driver_wext_get_range(void *priv) drv->capa.max_scan_ssids = 1; wpa_printf(MSG_DEBUG, " capabilities: key_mgmt 0x%x enc 0x%x " - "flags 0x%x", - drv->capa.key_mgmt, drv->capa.enc, drv->capa.flags); + "flags 0x%llx", + drv->capa.key_mgmt, drv->capa.enc, + (unsigned long long) drv->capa.flags); } else { wpa_printf(MSG_DEBUG, "SIOCGIWRANGE: too old (short) data - " "assuming WPA is not supported"); diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index 04e35efc..57e2f6f3 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -575,7 +575,7 @@ struct wpa_supplicant { int scan_id[MAX_SCAN_ID]; unsigned int scan_id_count; - unsigned int drv_flags; + u64 drv_flags; unsigned int drv_enc; /* |