diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-15 05:43:26 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-09-15 05:43:26 -0600 |
| commit | db81de1eb825b24b725f1fc42deca90209aa5686 (patch) | |
| tree | 226718c6430db97149ff6be759c96b17ae40aac3 | |
| parent | 44f100057998df58e805f212d038a0139e80ae46 (diff) | |
| parent | 15d640d55dfb75f71247c91ad4e910eacac28d0c (diff) | |
| download | android_external_wpa_supplicant_8-db81de1eb825b24b725f1fc42deca90209aa5686.tar.gz android_external_wpa_supplicant_8-db81de1eb825b24b725f1fc42deca90209aa5686.tar.bz2 android_external_wpa_supplicant_8-db81de1eb825b24b725f1fc42deca90209aa5686.zip | |
Promotion of wlan-aosp-service.lnx.2.0-00005.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1065588 Ie86165061a48f0ceee63fef5ed40cb060fd464ca nl80211: Use the monitor interface only without device_a
Change-Id: Ic2bec9f1f18f6199b521edab47d636742476c93c
CRs-Fixed: 1065588
| -rw-r--r-- | src/drivers/driver_nl80211_capa.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c index 56647449..c390e68c 100644 --- a/src/drivers/driver_nl80211_capa.c +++ b/src/drivers/driver_nl80211_capa.c @@ -66,7 +66,6 @@ struct wiphy_info_data { unsigned int device_ap_sme:1; unsigned int poll_command_supported:1; unsigned int data_tx_status:1; - unsigned int monitor_supported:1; unsigned int auth_supported:1; unsigned int connect_supported:1; unsigned int p2p_go_supported:1; @@ -129,9 +128,6 @@ static void wiphy_info_supported_iftypes(struct wiphy_info_data *info, case NL80211_IFTYPE_P2P_CLIENT: info->p2p_client_supported = 1; break; - case NL80211_IFTYPE_MONITOR: - info->monitor_supported = 1; - break; } } } @@ -1031,21 +1027,8 @@ int wpa_driver_nl80211_capa(struct wpa_driver_nl80211_data *drv) * If poll command and tx status are supported, mac80211 is new enough * to have everything we need to not need monitor interfaces. */ - drv->use_monitor = !info.poll_command_supported || !info.data_tx_status; - - if (drv->device_ap_sme && drv->use_monitor) { - /* - * Non-mac80211 drivers may not support monitor interface. - * Make sure we do not get stuck with incorrect capability here - * by explicitly testing this. - */ - if (!info.monitor_supported) { - wpa_printf(MSG_DEBUG, "nl80211: Disable use_monitor " - "with device_ap_sme since no monitor mode " - "support detected"); - drv->use_monitor = 0; - } - } + drv->use_monitor = !info.device_ap_sme && + (!info.poll_command_supported || !info.data_tx_status); /* * If we aren't going to use monitor interfaces, but the |