diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-12-15 20:55:21 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-15 20:55:21 -0800 |
| commit | 70259992a91f4aee06897132a275e30ff39b2522 (patch) | |
| tree | 69d074ce4fbdda668a5decc9d69172a1f3293681 /src | |
| parent | f8ff45ec00b804bc9cca1ebdaf52791e2545c866 (diff) | |
| parent | a2d0653f29774c35a9d7deea9a966143f033d8fb (diff) | |
| download | android_external_wpa_supplicant_8-70259992a91f4aee06897132a275e30ff39b2522.tar.gz android_external_wpa_supplicant_8-70259992a91f4aee06897132a275e30ff39b2522.tar.bz2 android_external_wpa_supplicant_8-70259992a91f4aee06897132a275e30ff39b2522.zip | |
Merge "nl80211: Add driver flag to indicate mesh support"
Diffstat (limited to 'src')
| -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 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/drivers/driver.h b/src/drivers/driver.h index c504f2fe..1f3693a3 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1013,7 +1013,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 14391b2f..06426983 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -3530,6 +3530,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"); |