diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2013-01-16 15:42:32 -0800 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-01-16 15:42:32 -0800 |
commit | b7a3187fbbba0991b789298cb208d913334a6acb (patch) | |
tree | 9edc736beeea7d0fb7dd8745a0b1a9a12291238a /bcmdhd/wpa_supplicant_8_lib | |
parent | 739bcee013f3a80e758855bc8fba7fb3f2847fff (diff) | |
download | hardware_broadcom_wlan-b7a3187fbbba0991b789298cb208d913334a6acb.zip hardware_broadcom_wlan-b7a3187fbbba0991b789298cb208d913334a6acb.tar.gz hardware_broadcom_wlan-b7a3187fbbba0991b789298cb208d913334a6acb.tar.bz2 |
wpa_supplicant_lib: Remove obsolete functionality
Change-Id: I8f21f84c21a7a6bad8379a2358a3e7553580d386
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'bcmdhd/wpa_supplicant_8_lib')
-rw-r--r-- | bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c | 200 |
1 files changed, 1 insertions, 199 deletions
diff --git a/bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c b/bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c index b38e528..720243e 100644 --- a/bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c +++ b/bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c @@ -17,9 +17,6 @@ #include "android_drv.h" #endif -#define WPA_PS_ENABLED 0 -#define WPA_PS_DISABLED 1 - #define MAX_WPSP2PIE_CMD_SIZE 512 typedef struct android_wifi_priv_cmd { @@ -28,10 +25,6 @@ typedef struct android_wifi_priv_cmd { int total_len; } android_wifi_priv_cmd; -int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv, struct nl_msg *msg, - int (*valid_handler)(struct nl_msg *, void *), - void *valid_data); - static int drv_errors = 0; static void wpa_driver_send_hang_msg(struct wpa_driver_nl80211_data *drv) @@ -43,166 +36,6 @@ static void wpa_driver_send_hang_msg(struct wpa_driver_nl80211_data *drv) } } -static int wpa_driver_set_power_save(void *priv, int state) -{ - struct i802_bss *bss = priv; - struct wpa_driver_nl80211_data *drv = bss->drv; - struct nl_msg *msg; - int ret = -1; - enum nl80211_ps_state ps_state; - - msg = nlmsg_alloc(); - if (!msg) - return -1; - - genlmsg_put(msg, 0, 0, drv->global->nl80211_id, 0, 0, - NL80211_CMD_SET_POWER_SAVE, 0); - - if (state == WPA_PS_ENABLED) - ps_state = NL80211_PS_ENABLED; - else - ps_state = NL80211_PS_DISABLED; - - NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex); - NLA_PUT_U32(msg, NL80211_ATTR_PS_STATE, ps_state); - - ret = send_and_recv_msgs(drv, msg, NULL, NULL); - msg = NULL; - if (ret < 0) - wpa_printf(MSG_ERROR, "nl80211: Set power mode fail: %d", ret); -nla_put_failure: - nlmsg_free(msg); - return ret; -} - -static int get_power_mode_handler(struct nl_msg *msg, void *arg) -{ - struct nlattr *tb[NL80211_ATTR_MAX + 1]; - struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); - int *state = (int *)arg; - - nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), - genlmsg_attrlen(gnlh, 0), NULL); - - if (!tb[NL80211_ATTR_PS_STATE]) - return NL_SKIP; - - if (state) { - *state = (int)nla_get_u32(tb[NL80211_ATTR_PS_STATE]); - wpa_printf(MSG_DEBUG, "nl80211: Get power mode = %d", *state); - *state = (*state == NL80211_PS_ENABLED) ? - WPA_PS_ENABLED : WPA_PS_DISABLED; - } - - return NL_SKIP; -} - -static int wpa_driver_get_power_save(void *priv, int *state) -{ - struct i802_bss *bss = priv; - struct wpa_driver_nl80211_data *drv = bss->drv; - struct nl_msg *msg; - int ret = -1; - enum nl80211_ps_state ps_state; - - msg = nlmsg_alloc(); - if (!msg) - return -1; - - genlmsg_put(msg, 0, 0, drv->global->nl80211_id, 0, 0, - NL80211_CMD_GET_POWER_SAVE, 0); - - NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex); - - ret = send_and_recv_msgs(drv, msg, get_power_mode_handler, state); - msg = NULL; - if (ret < 0) - wpa_printf(MSG_ERROR, "nl80211: Get power mode fail: %d", ret); -nla_put_failure: - nlmsg_free(msg); - return ret; -} - -static int wpa_driver_set_backgroundscan_params(void *priv) -{ - struct i802_bss *bss = priv; - struct wpa_driver_nl80211_data *drv = bss->drv; - struct wpa_supplicant *wpa_s; - struct ifreq ifr; - android_wifi_priv_cmd priv_cmd; - int ret = 0, i = 0, bp; - char buf[WEXT_PNO_MAX_COMMAND_SIZE]; - struct wpa_ssid *ssid_conf; - - if (drv == NULL) { - wpa_printf(MSG_ERROR, "%s: drv is NULL. Exiting", __func__); - return -1; - } - if (drv->ctx == NULL) { - wpa_printf(MSG_ERROR, "%s: drv->ctx is NULL. Exiting", __func__); - return -1; - } - wpa_s = (struct wpa_supplicant *)(drv->ctx); - if (wpa_s->conf == NULL) { - wpa_printf(MSG_ERROR, "%s: wpa_s->conf is NULL. Exiting", __func__); - return -1; - } - ssid_conf = wpa_s->conf->ssid; - - bp = WEXT_PNOSETUP_HEADER_SIZE; - os_memcpy(buf, WEXT_PNOSETUP_HEADER, bp); - buf[bp++] = WEXT_PNO_TLV_PREFIX; - buf[bp++] = WEXT_PNO_TLV_VERSION; - buf[bp++] = WEXT_PNO_TLV_SUBVERSION; - buf[bp++] = WEXT_PNO_TLV_RESERVED; - - while ((i < WEXT_PNO_AMOUNT) && (ssid_conf != NULL)) { - /* Check that there is enough space needed for 1 more SSID, the other sections and null termination */ - if ((bp + WEXT_PNO_SSID_HEADER_SIZE + MAX_SSID_LEN + WEXT_PNO_NONSSID_SECTIONS_SIZE + 1) >= (int)sizeof(buf)) - break; - if ((!ssid_conf->disabled) && (ssid_conf->ssid_len <= MAX_SSID_LEN)){ - wpa_printf(MSG_DEBUG, "For PNO Scan: %s", ssid_conf->ssid); - buf[bp++] = WEXT_PNO_SSID_SECTION; - buf[bp++] = ssid_conf->ssid_len; - os_memcpy(&buf[bp], ssid_conf->ssid, ssid_conf->ssid_len); - bp += ssid_conf->ssid_len; - i++; - } - ssid_conf = ssid_conf->next; - } - - buf[bp++] = WEXT_PNO_SCAN_INTERVAL_SECTION; - os_snprintf(&buf[bp], WEXT_PNO_SCAN_INTERVAL_LENGTH + 1, "%x", WEXT_PNO_SCAN_INTERVAL); - bp += WEXT_PNO_SCAN_INTERVAL_LENGTH; - - buf[bp++] = WEXT_PNO_REPEAT_SECTION; - os_snprintf(&buf[bp], WEXT_PNO_REPEAT_LENGTH + 1, "%x", WEXT_PNO_REPEAT); - bp += WEXT_PNO_REPEAT_LENGTH; - - buf[bp++] = WEXT_PNO_MAX_REPEAT_SECTION; - os_snprintf(&buf[bp], WEXT_PNO_MAX_REPEAT_LENGTH + 1, "%x", WEXT_PNO_MAX_REPEAT); - bp += WEXT_PNO_MAX_REPEAT_LENGTH + 1; - - memset(&ifr, 0, sizeof(ifr)); - memset(&priv_cmd, 0, sizeof(priv_cmd)); - os_strncpy(ifr.ifr_name, bss->ifname, IFNAMSIZ); - - priv_cmd.buf = buf; - priv_cmd.used_len = bp; - priv_cmd.total_len = bp; - ifr.ifr_data = &priv_cmd; - - ret = ioctl(drv->global->ioctl_sock, SIOCDEVPRIVATE + 1, &ifr); - - if (ret < 0) { - wpa_printf(MSG_ERROR, "ioctl[SIOCSIWPRIV] (pnosetup): %d", ret); - wpa_driver_send_hang_msg(drv); - } else { - drv_errors = 0; - } - return ret; -} - int wpa_driver_nl80211_driver_cmd(void *priv, char *cmd, char *buf, size_t buf_len ) { @@ -225,39 +58,8 @@ int wpa_driver_nl80211_driver_cmd(void *priv, char *cmd, char *buf, if (!ret) ret = os_snprintf(buf, buf_len, "Macaddr = " MACSTR "\n", MAC2STR(macaddr)); - } else if (os_strcasecmp(cmd, "RELOAD") == 0) { - wpa_msg(drv->ctx, MSG_INFO, WPA_EVENT_DRIVER_STATE "HANGED"); - } else if (os_strncasecmp(cmd, "POWERMODE ", 10) == 0) { - int state; - - state = atoi(cmd + 10); - ret = wpa_driver_set_power_save(priv, state); - if (ret < 0) - wpa_driver_send_hang_msg(drv); - else - drv_errors = 0; - } else if (os_strncasecmp(cmd, "GETPOWER", 8) == 0) { - int state = -1; - - ret = wpa_driver_get_power_save(priv, &state); - if (!ret && (state != -1)) { - ret = os_snprintf(buf, buf_len, "POWERMODE = %d\n", state); - drv_errors = 0; - } else { - wpa_driver_send_hang_msg(drv); - } } else { /* Use private command */ - if (os_strcasecmp(cmd, "BGSCAN-START") == 0) { - ret = wpa_driver_set_backgroundscan_params(priv); - if (ret < 0) { - return ret; - } - os_memcpy(buf, "PNOFORCE 1", 11); - } else if (os_strcasecmp(cmd, "BGSCAN-STOP") == 0) { - os_memcpy(buf, "PNOFORCE 0", 11); - } else { - os_memcpy(buf, cmd, strlen(cmd) + 1); - } + os_memcpy(buf, cmd, strlen(cmd) + 1); memset(&ifr, 0, sizeof(ifr)); memset(&priv_cmd, 0, sizeof(priv_cmd)); os_strncpy(ifr.ifr_name, bss->ifname, IFNAMSIZ); |