Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

6 files changed, 32 insertions, 63 deletions

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 6fef4925d13a..8d8ee639fe56 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -376,7 +376,12 @@ mwifiex_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev,
                              struct ieee80211_channel *chan,
                              enum nl80211_channel_type channel_type)
 {
-        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        struct mwifiex_private *priv;
+
+        if (dev)
+                priv = mwifiex_netdev_get_priv(dev);
+        else
+                priv = mwifiex_cfg80211_get_priv(wiphy);
 
         if (priv->media_connected) {
                 wiphy_err(wiphy, "This setting is valid only when station "
@@ -534,6 +539,11 @@ mwifiex_dump_station_info(struct mwifiex_private *priv,
                 ret = -EFAULT;
         }
 
+        /* Get DTIM period information from firmware */
+        mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                              HostCmd_ACT_GEN_GET, DTIM_PERIOD_I,
+                              &priv->dtim_period);
+
         /*
          * Bit 0 in tx_htinfo indicates that current Tx rate is 11n rate. Valid
          * MCS index values for us are 0 to 7.
@@ -568,8 +578,7 @@ mwifiex_dump_station_info(struct mwifiex_private *priv,
                                                 WLAN_CAPABILITY_SHORT_SLOT_TIME)
                         sinfo->bss_param.flags |=
                                         BSS_PARAM_FLAGS_SHORT_SLOT_TIME;
-                sinfo->bss_param.dtim_period =
-                        priv->curr_bss_params.bss_descriptor.dtim_period;
+                sinfo->bss_param.dtim_period = priv->dtim_period;
                 sinfo->bss_param.beacon_interval =
                         priv->curr_bss_params.bss_descriptor.beacon_period;
         }
@@ -858,7 +867,12 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
                 ret = mwifiex_set_rf_channel(priv, channel,
                                                 priv->adapter->channel_type);
 
-        ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);  /* Disable keys */
+        /* As this is new association, clear locally stored
+         * keys and security related flags */
+        priv->sec_info.wpa_enabled = false;
+        priv->sec_info.wpa2_enabled = false;
+        priv->wep_key_curr_index = 0;
+        ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);
 
         if (mode == NL80211_IFTYPE_ADHOC) {
                 /* "privacy" is set only for ad-hoc mode */
@@ -903,6 +917,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
                         dev_dbg(priv->adapter->dev,
                                 "info: setting wep encryption"
                                 " with key len %d\n", sme->key_len);
+                        priv->wep_key_curr_index = sme->key_idx;
                         ret = mwifiex_set_encode(priv, sme->key, sme->key_len,
                                                         sme->key_idx, 0);
                 }
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 84fcb741a296..ca59cc0d013e 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -280,6 +280,7 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
         adapter->adhoc_awake_period = 0;
         memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter));
         adapter->arp_filter_size = 0;
+        adapter->channel_type = NL80211_CHAN_HT20;
 }
 
 /*
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 3dc0f721c1db..52810b1497ea 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -249,7 +249,6 @@ struct mwifiex_bssdescriptor {
         u32 channel;
         u32 freq;
         u16 beacon_period;
-        u8 dtim_period;
         u8 erp_flags;
         u32 bss_mode;
         u8 supported_rates[MWIFIEX_SUPPORTED_RATES];
@@ -392,6 +391,7 @@ struct mwifiex_private {
         u8 prev_bssid[ETH_ALEN];
         struct mwifiex_current_bss_params curr_bss_params;
         u16 beacon_period;
+        u8 dtim_period;
         u16 listen_interval;
         u16 atim_window;
         u8 adhoc_channel;
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 135208596aff..98f1ca9cd6d8 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1086,7 +1086,6 @@ mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
         struct ieee_types_vendor_specific *vendor_ie;
         const u8 wpa_oui[4] = { 0x00, 0x50, 0xf2, 0x01 };
         const u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 };
-        struct ieee80211_tim_ie *tim_ie;
 
         found_data_rate_ie = false;
         rate_size = 0;
@@ -1259,11 +1258,6 @@ mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
                                         sizeof(struct ieee_types_header) -
                                         bss_entry->beacon_buf);
                         break;
-                case WLAN_EID_TIM:
-                        tim_ie = (void *) (current_ptr +
-                                         sizeof(struct ieee_types_header));
-                        bss_entry->dtim_period = tim_ie->dtim_period;
-                        break;
                 default:
                         break;
                 }
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index 6e443ffa0465..324c651527cb 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -103,7 +103,7 @@ static int mwifiex_cmd_mac_control(struct mwifiex_private *priv,
 static int mwifiex_cmd_802_11_snmp_mib(struct mwifiex_private *priv,
                                        struct host_cmd_ds_command *cmd,
                                        u16 cmd_action, u32 cmd_oid,
-                                       u32 *ul_temp)
+                                       u16 *ul_temp)
 {
         struct host_cmd_ds_802_11_snmp_mib *snmp_mib = &cmd->params.smib;
 
@@ -112,62 +112,18 @@ static int mwifiex_cmd_802_11_snmp_mib(struct mwifiex_private *priv,
         cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_802_11_snmp_mib)
                 - 1 + S_DS_GEN);
 
+        snmp_mib->oid = cpu_to_le16((u16)cmd_oid);
         if (cmd_action == HostCmd_ACT_GEN_GET) {
                 snmp_mib->query_type = cpu_to_le16(HostCmd_ACT_GEN_GET);
                 snmp_mib->buf_size = cpu_to_le16(MAX_SNMP_BUF_SIZE);
-                cmd->size = cpu_to_le16(le16_to_cpu(cmd->size)
-                        + MAX_SNMP_BUF_SIZE);
+                le16_add_cpu(&cmd->size, MAX_SNMP_BUF_SIZE);
+        } else if (cmd_action == HostCmd_ACT_GEN_SET) {
+                snmp_mib->query_type = cpu_to_le16(HostCmd_ACT_GEN_SET);
+                snmp_mib->buf_size = cpu_to_le16(sizeof(u16));
+                *((__le16 *) (snmp_mib->value)) = cpu_to_le16(*ul_temp);
+                le16_add_cpu(&cmd->size, sizeof(u16));
         }
 
-        switch (cmd_oid) {
-        case FRAG_THRESH_I:
-                snmp_mib->oid = cpu_to_le16((u16) FRAG_THRESH_I);
-                if (cmd_action == HostCmd_ACT_GEN_SET) {
-                        snmp_mib->query_type = cpu_to_le16(HostCmd_ACT_GEN_SET);
-                        snmp_mib->buf_size = cpu_to_le16(sizeof(u16));
-                        *((__le16 *) (snmp_mib->value)) =
-                                cpu_to_le16((u16) *ul_temp);
-                        cmd->size = cpu_to_le16(le16_to_cpu(cmd->size)
-                                + sizeof(u16));
-                }
-                break;
-        case RTS_THRESH_I:
-                snmp_mib->oid = cpu_to_le16((u16) RTS_THRESH_I);
-                if (cmd_action == HostCmd_ACT_GEN_SET) {
-                        snmp_mib->query_type = cpu_to_le16(HostCmd_ACT_GEN_SET);
-                        snmp_mib->buf_size = cpu_to_le16(sizeof(u16));
-                        *(__le16 *) (snmp_mib->value) =
-                                cpu_to_le16((u16) *ul_temp);
-                        cmd->size = cpu_to_le16(le16_to_cpu(cmd->size)
-                                + sizeof(u16));
-                }
-                break;
-
-        case SHORT_RETRY_LIM_I:
-                snmp_mib->oid = cpu_to_le16((u16) SHORT_RETRY_LIM_I);
-                if (cmd_action == HostCmd_ACT_GEN_SET) {
-                        snmp_mib->query_type = cpu_to_le16(HostCmd_ACT_GEN_SET);
-                        snmp_mib->buf_size = cpu_to_le16(sizeof(u16));
-                        *((__le16 *) (snmp_mib->value)) =
-                                cpu_to_le16((u16) *ul_temp);
-                        cmd->size = cpu_to_le16(le16_to_cpu(cmd->size)
-                                + sizeof(u16));
-                }
-                break;
-        case DOT11D_I:
-                snmp_mib->oid = cpu_to_le16((u16) DOT11D_I);
-                if (cmd_action == HostCmd_ACT_GEN_SET) {
-                        snmp_mib->query_type = cpu_to_le16(HostCmd_ACT_GEN_SET);
-                        snmp_mib->buf_size = cpu_to_le16(sizeof(u16));
-                        *((__le16 *) (snmp_mib->value)) =
-                                cpu_to_le16((u16) *ul_temp);
-                        cmd->size = cpu_to_le16(le16_to_cpu(cmd->size)
-                                + sizeof(u16));
-                }
-                break;
-        default:
-                break;
-        }
         dev_dbg(priv->adapter->dev,
                 "cmd: SNMP_CMD: Action=0x%x, OID=0x%x, OIDSize=0x%x,"
                 " Value=0x%x\n",
diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c
index e812db8b695c..0d8618a8443f 100644
--- a/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@ -210,6 +210,9 @@ static int mwifiex_ret_802_11_snmp_mib(struct mwifiex_private *priv,
                         dev_dbg(priv->adapter->dev,
                                 "info: SNMP_RESP: TxRetryCount=%u\n", ul_temp);
                         break;
+                case DTIM_PERIOD_I:
+                        dev_dbg(priv->adapter->dev,
+                                "info: SNMP_RESP: DTIM period=%u\n", ul_temp);
                 default:
                         break;
                 }