Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller:
 "Here is my initial pull request for the networking subsystem during
  this merge window:

   1) Support for ESN in AH (RFC 4302) from Fan Du.

   2) Add full kernel doc for ethtool command structures, from Ben
      Hutchings.

   3) Add BCM7xxx PHY driver, from Florian Fainelli.

   4) Export computed TCP rate information in netlink socket dumps, from
      Eric Dumazet.

   5) Allow IPSEC SA to be dumped partially using a filter, from Nicolas
      Dichtel.

   6) Convert many drivers to pci_enable_msix_range(), from Alexander
      Gordeev.

   7) Record SKB timestamps more efficiently, from Eric Dumazet.

   8) Switch to microsecond resolution for TCP round trip times, also
      from Eric Dumazet.

   9) Clean up and fix 6lowpan fragmentation handling by making use of
      the existing inet_frag api for it's implementation.

  10) Add TX grant mapping to xen-netback driver, from Zoltan Kiss.

  11) Auto size SKB lengths when composing netlink messages based upon
      past message sizes used, from Eric Dumazet.

  12) qdisc dumps can take a long time, add a cond_resched(), From Eric
      Dumazet.

  13) Sanitize netpoll core and drivers wrt.  SKB handling semantics.
      Get rid of never-used-in-tree netpoll RX handling.  From Eric W
      Biederman.

  14) Support inter-address-family and namespace changing in VTI tunnel
      driver(s).  From Steffen Klassert.

  15) Add Altera TSE driver, from Vince Bridgers.

  16) Optimizing csum_replace2() so that it doesn't adjust the checksum
      by checksumming the entire header, from Eric Dumazet.

  17) Expand BPF internal implementation for faster interpreting, more
      direct translations into JIT'd code, and much cleaner uses of BPF
      filtering in non-socket ocntexts.  From Daniel Borkmann and Alexei
      Starovoitov"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1976 commits)
  netpoll: Use skb_irq_freeable to make zap_completion_queue safe.
  net: Add a test to see if a skb is freeable in irq context
  qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'
  net: ptp: move PTP classifier in its own file
  net: sxgbe: make "core_ops" static
  net: sxgbe: fix logical vs bitwise operation
  net: sxgbe: sxgbe_mdio_register() frees the bus
  Call efx_set_channels() before efx->type->dimension_resources()
  xen-netback: disable rogue vif in kthread context
  net/mlx4: Set proper build dependancy with vxlan
  be2net: fix build dependency on VxLAN
  mac802154: make csma/cca parameters per-wpan
  mac802154: allow only one WPAN to be up at any given time
  net: filter: minor: fix kdoc in __sk_run_filter
  netlink: don't compare the nul-termination in nla_strcmp
  can: c_can: Avoid led toggling for every packet.
  can: c_can: Simplify TX interrupt cleanup
  can: c_can: Store dlc private
  can: c_can: Reduce register access
  can: c_can: Make the code readable
  ...

1 files changed, 303 insertions, 100 deletions

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 8bfc07cd330e..21ee27ab7b74 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -252,9 +252,9 @@ mwifiex_cfg80211_mgmt_frame_register(struct wiphy *wiphy,
 
         if (mask != priv->mgmt_frame_mask) {
                 priv->mgmt_frame_mask = mask;
-                mwifiex_send_cmd_async(priv, HostCmd_CMD_MGMT_FRAME_REG,
-                                       HostCmd_ACT_GEN_SET, 0,
-                                       &priv->mgmt_frame_mask);
+                mwifiex_send_cmd(priv, HostCmd_CMD_MGMT_FRAME_REG,
+                                 HostCmd_ACT_GEN_SET, 0,
+                                 &priv->mgmt_frame_mask, false);
                 wiphy_dbg(wiphy, "info: mgmt frame registered\n");
         }
 }
@@ -515,8 +515,8 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
 
         priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
 
-        if (mwifiex_send_cmd_async(priv, HostCmd_CMD_802_11D_DOMAIN_INFO,
-                                   HostCmd_ACT_GEN_SET, 0, NULL)) {
+        if (mwifiex_send_cmd(priv, HostCmd_CMD_802_11D_DOMAIN_INFO,
+                             HostCmd_ACT_GEN_SET, 0, NULL, false)) {
                 wiphy_err(wiphy, "11D: setting domain info in FW\n");
                 return -1;
         }
@@ -580,9 +580,9 @@ mwifiex_set_frag(struct mwifiex_private *priv, u32 frag_thr)
             frag_thr > MWIFIEX_FRAG_MAX_VALUE)
                 frag_thr = MWIFIEX_FRAG_MAX_VALUE;
 
-        return mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
-                                     HostCmd_ACT_GEN_SET, FRAG_THRESH_I,
-                                     &frag_thr);
+        return mwifiex_send_cmd(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                                HostCmd_ACT_GEN_SET, FRAG_THRESH_I,
+                                &frag_thr, true);
 }
 
 /*
@@ -597,9 +597,9 @@ mwifiex_set_rts(struct mwifiex_private *priv, u32 rts_thr)
         if (rts_thr < MWIFIEX_RTS_MIN_VALUE || rts_thr > MWIFIEX_RTS_MAX_VALUE)
                 rts_thr = MWIFIEX_RTS_MAX_VALUE;
 
-        return mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
-                                    HostCmd_ACT_GEN_SET, RTS_THRESH_I,
-                                    &rts_thr);
+        return mwifiex_send_cmd(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                                HostCmd_ACT_GEN_SET, RTS_THRESH_I,
+                                &rts_thr, true);
 }
 
 /*
@@ -637,20 +637,19 @@ mwifiex_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
 
                         bss_started = priv->bss_started;
 
-                        ret = mwifiex_send_cmd_sync(priv,
-                                                    HostCmd_CMD_UAP_BSS_STOP,
-                                                    HostCmd_ACT_GEN_SET, 0,
-                                                    NULL);
+                        ret = mwifiex_send_cmd(priv, HostCmd_CMD_UAP_BSS_STOP,
+                                               HostCmd_ACT_GEN_SET, 0,
+                                               NULL, true);
                         if (ret) {
                                 wiphy_err(wiphy, "Failed to stop the BSS\n");
                                 kfree(bss_cfg);
                                 return ret;
                         }
 
-                        ret = mwifiex_send_cmd_async(priv,
-                                                     HostCmd_CMD_UAP_SYS_CONFIG,
-                                                     HostCmd_ACT_GEN_SET,
-                                                     UAP_BSS_PARAMS_I, bss_cfg);
+                        ret = mwifiex_send_cmd(priv, HostCmd_CMD_UAP_SYS_CONFIG,
+                                               HostCmd_ACT_GEN_SET,
+                                               UAP_BSS_PARAMS_I, bss_cfg,
+                                               false);
 
                         kfree(bss_cfg);
 
@@ -662,10 +661,9 @@ mwifiex_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
                         if (!bss_started)
                                 break;
 
-                        ret = mwifiex_send_cmd_async(priv,
-                                                     HostCmd_CMD_UAP_BSS_START,
-                                                     HostCmd_ACT_GEN_SET, 0,
-                                                     NULL);
+                        ret = mwifiex_send_cmd(priv, HostCmd_CMD_UAP_BSS_START,
+                                               HostCmd_ACT_GEN_SET, 0,
+                                               NULL, false);
                         if (ret) {
                                 wiphy_err(wiphy, "Failed to start BSS\n");
                                 return ret;
@@ -700,8 +698,8 @@ mwifiex_cfg80211_deinit_p2p(struct mwifiex_private *priv)
         if (GET_BSS_ROLE(priv) != MWIFIEX_BSS_ROLE_STA)
                 mwifiex_set_bss_role(priv, MWIFIEX_BSS_ROLE_STA);
 
-        if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_P2P_MODE_CFG,
-                                  HostCmd_ACT_GEN_SET, 0, &mode))
+        if (mwifiex_send_cmd(priv, HostCmd_CMD_P2P_MODE_CFG,
+                             HostCmd_ACT_GEN_SET, 0, &mode, true))
                 return -1;
 
         return 0;
@@ -721,13 +719,13 @@ mwifiex_cfg80211_init_p2p_client(struct mwifiex_private *priv)
                 return -1;
 
         mode = P2P_MODE_DEVICE;
-        if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_P2P_MODE_CFG,
-                                  HostCmd_ACT_GEN_SET, 0, &mode))
+        if (mwifiex_send_cmd(priv, HostCmd_CMD_P2P_MODE_CFG,
+                             HostCmd_ACT_GEN_SET, 0, &mode, true))
                 return -1;
 
         mode = P2P_MODE_CLIENT;
-        if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_P2P_MODE_CFG,
-                                  HostCmd_ACT_GEN_SET, 0, &mode))
+        if (mwifiex_send_cmd(priv, HostCmd_CMD_P2P_MODE_CFG,
+                             HostCmd_ACT_GEN_SET, 0, &mode, true))
                 return -1;
 
         return 0;
@@ -747,13 +745,13 @@ mwifiex_cfg80211_init_p2p_go(struct mwifiex_private *priv)
                 return -1;
 
         mode = P2P_MODE_DEVICE;
-        if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_P2P_MODE_CFG,
-                                  HostCmd_ACT_GEN_SET, 0, &mode))
+        if (mwifiex_send_cmd(priv, HostCmd_CMD_P2P_MODE_CFG,
+                             HostCmd_ACT_GEN_SET, 0, &mode, true))
                 return -1;
 
         mode = P2P_MODE_GO;
-        if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_P2P_MODE_CFG,
-                                  HostCmd_ACT_GEN_SET, 0, &mode))
+        if (mwifiex_send_cmd(priv, HostCmd_CMD_P2P_MODE_CFG,
+                             HostCmd_ACT_GEN_SET, 0, &mode, true))
                 return -1;
 
         if (GET_BSS_ROLE(priv) != MWIFIEX_BSS_ROLE_UAP)
@@ -853,8 +851,8 @@ mwifiex_cfg80211_change_virtual_intf(struct wiphy *wiphy,
 
         priv->sec_info.authentication_mode = NL80211_AUTHTYPE_OPEN_SYSTEM;
 
-        ret = mwifiex_send_cmd_sync(priv, HostCmd_CMD_SET_BSS_MODE,
-                                    HostCmd_ACT_GEN_SET, 0, NULL);
+        ret = mwifiex_send_cmd(priv, HostCmd_CMD_SET_BSS_MODE,
+                               HostCmd_ACT_GEN_SET, 0, NULL, true);
 
         return ret;
 }
@@ -942,8 +940,8 @@ mwifiex_dump_station_info(struct mwifiex_private *priv,
                         STATION_INFO_SIGNAL | STATION_INFO_SIGNAL_AVG;
 
         /* Get signal information from the firmware */
-        if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_RSSI_INFO,
-                                  HostCmd_ACT_GEN_GET, 0, NULL)) {
+        if (mwifiex_send_cmd(priv, HostCmd_CMD_RSSI_INFO,
+                             HostCmd_ACT_GEN_GET, 0, NULL, true)) {
                 dev_err(priv->adapter->dev, "failed to get signal information\n");
                 return -EFAULT;
         }
@@ -954,9 +952,9 @@ mwifiex_dump_station_info(struct mwifiex_private *priv,
         }
 
         /* 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);
+        mwifiex_send_cmd(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                         HostCmd_ACT_GEN_GET, DTIM_PERIOD_I,
+                         &priv->dtim_period, true);
 
         mwifiex_parse_htinfo(priv, priv->tx_htinfo, &sinfo->txrate);
 
@@ -1160,9 +1158,10 @@ static int mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy,
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
         u16 bitmap_rates[MAX_BITMAP_RATES_SIZE];
         enum ieee80211_band band;
+        struct mwifiex_adapter *adapter = priv->adapter;
 
         if (!priv->media_connected) {
-                dev_err(priv->adapter->dev,
+                dev_err(adapter->dev,
                         "Can not set Tx data rate in disconnected state\n");
                 return -EINVAL;
         }
@@ -1183,11 +1182,18 @@ static int mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy,
 
         /* Fill HT MCS rates */
         bitmap_rates[2] = mask->control[band].ht_mcs[0];
-        if (priv->adapter->hw_dev_mcs_support == HT_STREAM_2X2)
+        if (adapter->hw_dev_mcs_support == HT_STREAM_2X2)
                 bitmap_rates[2] |= mask->control[band].ht_mcs[1] << 8;
 
-        return mwifiex_send_cmd_sync(priv, HostCmd_CMD_TX_RATE_CFG,
-                                     HostCmd_ACT_GEN_SET, 0, bitmap_rates);
+       /* Fill VHT MCS rates */
+        if (adapter->fw_api_ver == MWIFIEX_FW_V15) {
+                bitmap_rates[10] = mask->control[band].vht_mcs[0];
+                if (adapter->hw_dev_mcs_support == HT_STREAM_2X2)
+                        bitmap_rates[11] = mask->control[band].vht_mcs[1];
+        }
+
+        return mwifiex_send_cmd(priv, HostCmd_CMD_TX_RATE_CFG,
+                                HostCmd_ACT_GEN_SET, 0, bitmap_rates, true);
 }
 
 /*
@@ -1216,14 +1222,14 @@ static int mwifiex_cfg80211_set_cqm_rssi_config(struct wiphy *wiphy,
                 subsc_evt.bcn_h_rssi_cfg.abs_value = abs(rssi_thold);
                 subsc_evt.bcn_l_rssi_cfg.evt_freq = 1;
                 subsc_evt.bcn_h_rssi_cfg.evt_freq = 1;
-                return mwifiex_send_cmd_sync(priv,
-                                             HostCmd_CMD_802_11_SUBSCRIBE_EVENT,
-                                             0, 0, &subsc_evt);
+                return mwifiex_send_cmd(priv,
+                                        HostCmd_CMD_802_11_SUBSCRIBE_EVENT,
+                                        0, 0, &subsc_evt, true);
         } else {
                 subsc_evt.action = HostCmd_ACT_BITWISE_CLR;
-                return mwifiex_send_cmd_sync(priv,
-                                             HostCmd_CMD_802_11_SUBSCRIBE_EVENT,
-                                             0, 0, &subsc_evt);
+                return mwifiex_send_cmd(priv,
+                                        HostCmd_CMD_802_11_SUBSCRIBE_EVENT,
+                                        0, 0, &subsc_evt, true);
         }
 
         return 0;
@@ -1276,10 +1282,9 @@ mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev,
         if (!mac || is_broadcast_ether_addr(mac)) {
                 wiphy_dbg(wiphy, "%s: NULL/broadcast mac address\n", __func__);
                 list_for_each_entry(sta_node, &priv->sta_list, list) {
-                        if (mwifiex_send_cmd_sync(priv,
-                                                  HostCmd_CMD_UAP_STA_DEAUTH,
-                                                  HostCmd_ACT_GEN_SET, 0,
-                                                  sta_node->mac_addr))
+                        if (mwifiex_send_cmd(priv, HostCmd_CMD_UAP_STA_DEAUTH,
+                                             HostCmd_ACT_GEN_SET, 0,
+                                             sta_node->mac_addr, true))
                                 return -1;
                         mwifiex_uap_del_sta_data(priv, sta_node);
                 }
@@ -1289,10 +1294,9 @@ mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev,
                 sta_node = mwifiex_get_sta_entry(priv, mac);
                 spin_unlock_irqrestore(&priv->sta_list_spinlock, flags);
                 if (sta_node) {
-                        if (mwifiex_send_cmd_sync(priv,
-                                                  HostCmd_CMD_UAP_STA_DEAUTH,
-                                                  HostCmd_ACT_GEN_SET, 0,
-                                                  sta_node->mac_addr))
+                        if (mwifiex_send_cmd(priv, HostCmd_CMD_UAP_STA_DEAUTH,
+                                             HostCmd_ACT_GEN_SET, 0,
+                                             sta_node->mac_addr, true))
                                 return -1;
                         mwifiex_uap_del_sta_data(priv, sta_node);
                 }
@@ -1328,13 +1332,40 @@ mwifiex_cfg80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant)
                         tx_ant = RF_ANTENNA_AUTO;
                         rx_ant = RF_ANTENNA_AUTO;
                 }
+        } else {
+                struct ieee80211_sta_ht_cap *ht_info;
+                int rx_mcs_supp;
+                enum ieee80211_band band;
+
+                if ((tx_ant == 0x1 && rx_ant == 0x1)) {
+                        adapter->user_dev_mcs_support = HT_STREAM_1X1;
+                        if (adapter->is_hw_11ac_capable)
+                                adapter->usr_dot_11ac_mcs_support =
+                                                MWIFIEX_11AC_MCS_MAP_1X1;
+                } else {
+                        adapter->user_dev_mcs_support = HT_STREAM_2X2;
+                        if (adapter->is_hw_11ac_capable)
+                                adapter->usr_dot_11ac_mcs_support =
+                                                MWIFIEX_11AC_MCS_MAP_2X2;
+                }
+
+                for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+                        if (!adapter->wiphy->bands[band])
+                                continue;
+
+                        ht_info = &adapter->wiphy->bands[band]->ht_cap;
+                        rx_mcs_supp =
+                                GET_RXMCSSUPP(adapter->user_dev_mcs_support);
+                        memset(&ht_info->mcs, 0, adapter->number_of_antenna);
+                        memset(&ht_info->mcs, 0xff, rx_mcs_supp);
+                }
         }
 
         ant_cfg.tx_ant = tx_ant;
         ant_cfg.rx_ant = rx_ant;
 
-        return mwifiex_send_cmd_sync(priv, HostCmd_CMD_RF_ANTENNA,
-                                     HostCmd_ACT_GEN_SET, 0, &ant_cfg);
+        return mwifiex_send_cmd(priv, HostCmd_CMD_RF_ANTENNA,
+                                HostCmd_ACT_GEN_SET, 0, &ant_cfg, true);
 }
 
 /* cfg80211 operation handler for stop ap.
@@ -1349,8 +1380,8 @@ static int mwifiex_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
 
         priv->ap_11n_enabled = 0;
 
-        if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_UAP_BSS_STOP,
-                                  HostCmd_ACT_GEN_SET, 0, NULL)) {
+        if (mwifiex_send_cmd(priv, HostCmd_CMD_UAP_BSS_STOP,
+                             HostCmd_ACT_GEN_SET, 0, NULL, true)) {
                 wiphy_err(wiphy, "Failed to stop the BSS\n");
                 return -1;
         }
@@ -1416,9 +1447,6 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
 
                 if (params->chandef.width > NL80211_CHAN_WIDTH_20_NOHT)
                         config_bands |= BAND_GN;
-
-                if (params->chandef.width > NL80211_CHAN_WIDTH_40)
-                        config_bands |= BAND_GAC;
         } else {
                 bss_cfg->band_cfg = BAND_CONFIG_A;
                 config_bands = BAND_A;
@@ -1464,16 +1492,16 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
                 bss_cfg->ps_sta_ao_timer = 10 * params->inactivity_timeout;
         }
 
-        if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_UAP_BSS_STOP,
-                                  HostCmd_ACT_GEN_SET, 0, NULL)) {
+        if (mwifiex_send_cmd(priv, HostCmd_CMD_UAP_BSS_STOP,
+                             HostCmd_ACT_GEN_SET, 0, NULL, true)) {
                 wiphy_err(wiphy, "Failed to stop the BSS\n");
                 kfree(bss_cfg);
                 return -1;
         }
 
-        if (mwifiex_send_cmd_async(priv, HostCmd_CMD_UAP_SYS_CONFIG,
-                                   HostCmd_ACT_GEN_SET,
-                                   UAP_BSS_PARAMS_I, bss_cfg)) {
+        if (mwifiex_send_cmd(priv, HostCmd_CMD_UAP_SYS_CONFIG,
+                             HostCmd_ACT_GEN_SET,
+                             UAP_BSS_PARAMS_I, bss_cfg, false)) {
                 wiphy_err(wiphy, "Failed to set the SSID\n");
                 kfree(bss_cfg);
                 return -1;
@@ -1481,8 +1509,8 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
 
         kfree(bss_cfg);
 
-        if (mwifiex_send_cmd_async(priv, HostCmd_CMD_UAP_BSS_START,
-                                   HostCmd_ACT_GEN_SET, 0, NULL)) {
+        if (mwifiex_send_cmd(priv, HostCmd_CMD_UAP_BSS_START,
+                             HostCmd_ACT_GEN_SET, 0, NULL, false)) {
                 wiphy_err(wiphy, "Failed to start the BSS\n");
                 return -1;
         }
@@ -1492,9 +1520,9 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
         else
                 priv->curr_pkt_filter &= ~HostCmd_ACT_MAC_WEP_ENABLE;
 
-        if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_MAC_CONTROL,
-                                  HostCmd_ACT_GEN_SET, 0,
-                                  &priv->curr_pkt_filter))
+        if (mwifiex_send_cmd(priv, HostCmd_CMD_MAC_CONTROL,
+                             HostCmd_ACT_GEN_SET, 0,
+                             &priv->curr_pkt_filter, true))
                 return -1;
 
         return 0;
@@ -1583,8 +1611,9 @@ static int mwifiex_cfg80211_inform_ibss_bss(struct mwifiex_private *priv)
  * the function notifies the CFG802.11 subsystem of the new BSS connection.
  */
 static int
-mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
-                       u8 *bssid, int mode, struct ieee80211_channel *channel,
+mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len,
+                       const u8 *ssid, const u8 *bssid, int mode,
+                       struct ieee80211_channel *channel,
                        struct cfg80211_connect_params *sme, bool privacy)
 {
         struct cfg80211_ssid req_ssid;
@@ -1881,7 +1910,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
                                      params->privacy);
 done:
         if (!ret) {
-                cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid, GFP_KERNEL);
+                cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid,
+                                     params->chandef.chan, GFP_KERNEL);
                 dev_dbg(priv->adapter->dev,
                         "info: joined/created adhoc network with bssid"
                         " %pM successfully\n", priv->cfg_bssid);
@@ -2070,10 +2100,10 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info,
         else
                 ht_info->cap &= ~IEEE80211_HT_CAP_SGI_40;
 
-        if (ISSUPP_RXSTBC(adapter->hw_dot_11n_dev_cap))
-                ht_info->cap |= 1 << IEEE80211_HT_CAP_RX_STBC_SHIFT;
+        if (adapter->user_dev_mcs_support == HT_STREAM_2X2)
+                ht_info->cap |= 3 << IEEE80211_HT_CAP_RX_STBC_SHIFT;
         else
-                ht_info->cap &= ~(3 << IEEE80211_HT_CAP_RX_STBC_SHIFT);
+                ht_info->cap |= 1 << IEEE80211_HT_CAP_RX_STBC_SHIFT;
 
         if (ISSUPP_TXSTBC(adapter->hw_dot_11n_dev_cap))
                 ht_info->cap |= IEEE80211_HT_CAP_TX_STBC;
@@ -2098,8 +2128,8 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info,
         ht_info->cap &= ~IEEE80211_HT_CAP_MAX_AMSDU;
         ht_info->cap |= IEEE80211_HT_CAP_SM_PS;
 
-        rx_mcs_supp = GET_RXMCSSUPP(adapter->hw_dev_mcs_support);
-        /* Set MCS for 1x1 */
+        rx_mcs_supp = GET_RXMCSSUPP(adapter->user_dev_mcs_support);
+        /* Set MCS for 1x1/2x2 */
         memset(mcs, 0xff, rx_mcs_supp);
         /* Clear all the other values */
         memset(&mcs[rx_mcs_supp], 0,
@@ -2460,9 +2490,8 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy,
                                    MWIFIEX_CRITERIA_UNICAST |
                                    MWIFIEX_CRITERIA_MULTICAST;
 
-        ret =  mwifiex_send_cmd_sync(priv, HostCmd_CMD_MEF_CFG,
-                                     HostCmd_ACT_GEN_SET, 0,
-                                     &mef_cfg);
+        ret = mwifiex_send_cmd(priv, HostCmd_CMD_MEF_CFG,
+                               HostCmd_ACT_GEN_SET, 0, &mef_cfg, true);
 
         kfree(mef_entry);
         return ret;
@@ -2574,9 +2603,9 @@ static int mwifiex_cfg80211_set_coalesce(struct wiphy *wiphy,
         if (!coalesce) {
                 dev_dbg(adapter->dev,
                         "Disable coalesce and reset all previous rules\n");
-                return mwifiex_send_cmd_sync(priv, HostCmd_CMD_COALESCE_CFG,
-                                             HostCmd_ACT_GEN_SET, 0,
-                                             &coalesce_cfg);
+                return mwifiex_send_cmd(priv, HostCmd_CMD_COALESCE_CFG,
+                                        HostCmd_ACT_GEN_SET, 0,
+                                        &coalesce_cfg, true);
         }
 
         coalesce_cfg.num_of_rules = coalesce->n_rules;
@@ -2591,8 +2620,172 @@ static int mwifiex_cfg80211_set_coalesce(struct wiphy *wiphy,
                 }
         }
 
-        return mwifiex_send_cmd_sync(priv, HostCmd_CMD_COALESCE_CFG,
-                                     HostCmd_ACT_GEN_SET, 0, &coalesce_cfg);
+        return mwifiex_send_cmd(priv, HostCmd_CMD_COALESCE_CFG,
+                                HostCmd_ACT_GEN_SET, 0, &coalesce_cfg, true);
+}
+
+/* cfg80211 ops handler for tdls_mgmt.
+ * Function prepares TDLS action frame packets and forwards them to FW
+ */
+static int
+mwifiex_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
+                           u8 *peer, u8 action_code, u8 dialog_token,
+                           u16 status_code, u32 peer_capability,
+                           const u8 *extra_ies, size_t extra_ies_len)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        int ret;
+
+        if (!(wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS))
+                return -ENOTSUPP;
+
+        /* make sure we are in station mode and connected */
+        if (!(priv->bss_type == MWIFIEX_BSS_TYPE_STA && priv->media_connected))
+                return -ENOTSUPP;
+
+        switch (action_code) {
+        case WLAN_TDLS_SETUP_REQUEST:
+                dev_dbg(priv->adapter->dev,
+                        "Send TDLS Setup Request to %pM status_code=%d\n", peer,
+                         status_code);
+                ret = mwifiex_send_tdls_data_frame(priv, peer, action_code,
+                                                   dialog_token, status_code,
+                                                   extra_ies, extra_ies_len);
+                break;
+        case WLAN_TDLS_SETUP_RESPONSE:
+                dev_dbg(priv->adapter->dev,
+                        "Send TDLS Setup Response to %pM status_code=%d\n",
+                        peer, status_code);
+                ret = mwifiex_send_tdls_data_frame(priv, peer, action_code,
+                                                   dialog_token, status_code,
+                                                   extra_ies, extra_ies_len);
+                break;
+        case WLAN_TDLS_SETUP_CONFIRM:
+                dev_dbg(priv->adapter->dev,
+                        "Send TDLS Confirm to %pM status_code=%d\n", peer,
+                        status_code);
+                ret = mwifiex_send_tdls_data_frame(priv, peer, action_code,
+                                                   dialog_token, status_code,
+                                                   extra_ies, extra_ies_len);
+                break;
+        case WLAN_TDLS_TEARDOWN:
+                dev_dbg(priv->adapter->dev, "Send TDLS Tear down to %pM\n",
+                        peer);
+                ret = mwifiex_send_tdls_data_frame(priv, peer, action_code,
+                                                   dialog_token, status_code,
+                                                   extra_ies, extra_ies_len);
+                break;
+        case WLAN_TDLS_DISCOVERY_REQUEST:
+                dev_dbg(priv->adapter->dev,
+                        "Send TDLS Discovery Request to %pM\n", peer);
+                ret = mwifiex_send_tdls_data_frame(priv, peer, action_code,
+                                                   dialog_token, status_code,
+                                                   extra_ies, extra_ies_len);
+                break;
+        case WLAN_PUB_ACTION_TDLS_DISCOVER_RES:
+                dev_dbg(priv->adapter->dev,
+                        "Send TDLS Discovery Response to %pM\n", peer);
+                ret = mwifiex_send_tdls_action_frame(priv, peer, action_code,
+                                                   dialog_token, status_code,
+                                                   extra_ies, extra_ies_len);
+                break;
+        default:
+                dev_warn(priv->adapter->dev,
+                         "Unknown TDLS mgmt/action frame %pM\n", peer);
+                ret = -EINVAL;
+                break;
+        }
+
+        return ret;
+}
+
+static int
+mwifiex_cfg80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
+                           u8 *peer, enum nl80211_tdls_operation action)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+
+        if (!(wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS) ||
+            !(wiphy->flags & WIPHY_FLAG_TDLS_EXTERNAL_SETUP))
+                return -ENOTSUPP;
+
+        /* make sure we are in station mode and connected */
+        if (!(priv->bss_type == MWIFIEX_BSS_TYPE_STA && priv->media_connected))
+                return -ENOTSUPP;
+
+        dev_dbg(priv->adapter->dev,
+                "TDLS peer=%pM, oper=%d\n", peer, action);
+
+        switch (action) {
+        case NL80211_TDLS_ENABLE_LINK:
+                action = MWIFIEX_TDLS_ENABLE_LINK;
+                break;
+        case NL80211_TDLS_DISABLE_LINK:
+                action = MWIFIEX_TDLS_DISABLE_LINK;
+                break;
+        case NL80211_TDLS_TEARDOWN:
+                /* shouldn't happen!*/
+                dev_warn(priv->adapter->dev,
+                         "tdls_oper: teardown from driver not supported\n");
+                return -EINVAL;
+        case NL80211_TDLS_SETUP:
+                /* shouldn't happen!*/
+                dev_warn(priv->adapter->dev,
+                         "tdls_oper: setup from driver not supported\n");
+                return -EINVAL;
+        case NL80211_TDLS_DISCOVERY_REQ:
+                /* shouldn't happen!*/
+                dev_warn(priv->adapter->dev,
+                         "tdls_oper: discovery from driver not supported\n");
+                return -EINVAL;
+        default:
+                dev_err(priv->adapter->dev,
+                        "tdls_oper: operation not supported\n");
+                return -ENOTSUPP;
+        }
+
+        return mwifiex_tdls_oper(priv, peer, action);
+}
+
+static int
+mwifiex_cfg80211_add_station(struct wiphy *wiphy,
+                             struct net_device *dev,
+                             u8 *mac, struct station_parameters *params)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+
+        if (!(params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER)))
+                return -ENOTSUPP;
+
+        /* make sure we are in station mode and connected */
+        if ((priv->bss_type != MWIFIEX_BSS_TYPE_STA) || !priv->media_connected)
+                return -ENOTSUPP;
+
+        return mwifiex_tdls_oper(priv, mac, MWIFIEX_TDLS_CREATE_LINK);
+}
+
+static int
+mwifiex_cfg80211_change_station(struct wiphy *wiphy,
+                                struct net_device *dev,
+                                u8 *mac, struct station_parameters *params)
+{
+        int ret;
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+
+        /* we support change_station handler only for TDLS peers*/
+        if (!(params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER)))
+                return -ENOTSUPP;
+
+        /* make sure we are in station mode and connected */
+        if ((priv->bss_type != MWIFIEX_BSS_TYPE_STA) || !priv->media_connected)
+                return -ENOTSUPP;
+
+        priv->sta_params = params;
+
+        ret = mwifiex_tdls_oper(priv, mac, MWIFIEX_TDLS_CONFIG_LINK);
+        priv->sta_params = NULL;
+
+        return ret;
 }
 
 /* station cfg80211 operations */
@@ -2630,6 +2823,10 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = {
         .set_wakeup = mwifiex_cfg80211_set_wakeup,
 #endif
         .set_coalesce = mwifiex_cfg80211_set_coalesce,
+        .tdls_mgmt = mwifiex_cfg80211_tdls_mgmt,
+        .tdls_oper = mwifiex_cfg80211_tdls_oper,
+        .add_station = mwifiex_cfg80211_add_station,
+        .change_station = mwifiex_cfg80211_change_station,
 };
 
 #ifdef CONFIG_PM
@@ -2715,6 +2912,11 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
                         WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD |
                         WIPHY_FLAG_AP_UAPSD |
                         WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
+
+        if (ISSUPP_TDLS_ENABLED(adapter->fw_cap_info))
+                wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS |
+                                WIPHY_FLAG_TDLS_EXTERNAL_SETUP;
+
         wiphy->regulatory_flags |=
                         REGULATORY_CUSTOM_REG |
                         REGULATORY_STRICT_REG;
@@ -2736,7 +2938,8 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
 
         wiphy->features |= NL80211_FEATURE_HT_IBSS |
                            NL80211_FEATURE_INACTIVITY_TIMER |
-                           NL80211_FEATURE_LOW_PRIORITY_SCAN;
+                           NL80211_FEATURE_LOW_PRIORITY_SCAN |
+                           NL80211_FEATURE_NEED_OBSS_SCAN;
 
         /* Reserve space for mwifiex specific private data for BSS */
         wiphy->bss_priv_size = sizeof(struct mwifiex_bss_priv);
@@ -2767,17 +2970,17 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
                                    country_code);
         }
 
-        mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
-                              HostCmd_ACT_GEN_GET, FRAG_THRESH_I, &thr);
+        mwifiex_send_cmd(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                         HostCmd_ACT_GEN_GET, FRAG_THRESH_I, &thr, true);
         wiphy->frag_threshold = thr;
-        mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
-                              HostCmd_ACT_GEN_GET, RTS_THRESH_I, &thr);
+        mwifiex_send_cmd(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                         HostCmd_ACT_GEN_GET, RTS_THRESH_I, &thr, true);
         wiphy->rts_threshold = thr;
-        mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
-                              HostCmd_ACT_GEN_GET, SHORT_RETRY_LIM_I, &retry);
+        mwifiex_send_cmd(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                         HostCmd_ACT_GEN_GET, SHORT_RETRY_LIM_I, &retry, true);
         wiphy->retry_short = (u8) retry;
-        mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
-                              HostCmd_ACT_GEN_GET, LONG_RETRY_LIM_I, &retry);
+        mwifiex_send_cmd(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                         HostCmd_ACT_GEN_GET, LONG_RETRY_LIM_I, &retry, true);
         wiphy->retry_long = (u8) retry;
 
         adapter->wiphy = wiphy;