Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

8 files changed, 20 insertions, 40 deletions

diff --git a/drivers/net/wireless/iwlwifi/dvm/commands.h b/drivers/net/wireless/iwlwifi/dvm/commands.h
index 97bea16f3592..4a361c55c543 100644
--- a/drivers/net/wireless/iwlwifi/dvm/commands.h
+++ b/drivers/net/wireless/iwlwifi/dvm/commands.h
@@ -1905,6 +1905,7 @@ struct iwl_bt_cmd {
 #define IWLAGN_BT_PRIO_BOOST_MAX        0xFF
 #define IWLAGN_BT_PRIO_BOOST_MIN        0x00
 #define IWLAGN_BT_PRIO_BOOST_DEFAULT    0xF0
+#define IWLAGN_BT_PRIO_BOOST_DEFAULT32  0xF0F0F0F0
 
 #define IWLAGN_BT_MAX_KILL_DEFAULT      5
 
diff --git a/drivers/net/wireless/iwlwifi/dvm/lib.c b/drivers/net/wireless/iwlwifi/dvm/lib.c
index 207ae91a83aa..bef88c1a2c9b 100644
--- a/drivers/net/wireless/iwlwifi/dvm/lib.c
+++ b/drivers/net/wireless/iwlwifi/dvm/lib.c
@@ -265,6 +265,8 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv)
                         bt_cmd_v2.tx_prio_boost = 0;
                         bt_cmd_v2.rx_prio_boost = 0;
                 } else {
+                        /* older version only has 8 bits */
+                        WARN_ON(priv->cfg->bt_params->bt_prio_boost & ~0xFF);
                         bt_cmd_v1.prio_boost =
                                 priv->cfg->bt_params->bt_prio_boost;
                         bt_cmd_v1.tx_prio_boost = 0;
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index 612f05d757db..84d3db5aa506 100644
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -1232,7 +1232,6 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
         struct iwl_trans_config trans_cfg;
         static const u8 no_reclaim_cmds[] = {
                 REPLY_RX_PHY_CMD,
-                REPLY_RX,
                 REPLY_RX_MPDU_CMD,
                 REPLY_COMPRESSED_BA,
                 STATISTICS_NOTIFICATION,
diff --git a/drivers/net/wireless/iwlwifi/dvm/rx.c b/drivers/net/wireless/iwlwifi/dvm/rx.c
index c1f7a18e08dd..fee5cffa1669 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rx.c
@@ -88,7 +88,6 @@ const char *iwl_dvm_cmd_strings[REPLY_MAX] = {
         IWL_CMD_ENTRY(REPLY_PHY_CALIBRATION_CMD),
         IWL_CMD_ENTRY(REPLY_RX_PHY_CMD),
         IWL_CMD_ENTRY(REPLY_RX_MPDU_CMD),
-        IWL_CMD_ENTRY(REPLY_RX),
         IWL_CMD_ENTRY(REPLY_COMPRESSED_BA),
         IWL_CMD_ENTRY(CALIBRATION_CFG_CMD),
         IWL_CMD_ENTRY(CALIBRATION_RES_NOTIFICATION),
@@ -895,8 +894,7 @@ static int iwlagn_calc_rssi(struct iwl_priv *priv,
         return max_rssi - agc - IWLAGN_RSSI_OFFSET;
 }
 
-/* Called for REPLY_RX (legacy ABG frames), or
- * REPLY_RX_MPDU_CMD (HT high-throughput N frames). */
+/* Called for REPLY_RX_MPDU_CMD */
 static int iwlagn_rx_reply_rx(struct iwl_priv *priv,
                             struct iwl_rx_cmd_buffer *rxb,
                             struct iwl_device_cmd *cmd)
@@ -911,37 +909,17 @@ static int iwlagn_rx_reply_rx(struct iwl_priv *priv,
         u32 ampdu_status;
         u32 rate_n_flags;
 
-        /**
-         * REPLY_RX and REPLY_RX_MPDU_CMD are handled differently.
-         *      REPLY_RX: physical layer info is in this buffer
-         *      REPLY_RX_MPDU_CMD: physical layer info was sent in separate
-         *              command and cached in priv->last_phy_res
-         *
-         * Here we set up local variables depending on which command is
-         * received.
-         */
-        if (pkt->hdr.cmd == REPLY_RX) {
-                phy_res = (struct iwl_rx_phy_res *)pkt->data;
-                header = (struct ieee80211_hdr *)(pkt->data + sizeof(*phy_res)
-                                + phy_res->cfg_phy_cnt);
-
-                len = le16_to_cpu(phy_res->byte_count);
-                rx_pkt_status = *(__le32 *)(pkt->data + sizeof(*phy_res) +
-                                phy_res->cfg_phy_cnt + len);
-                ampdu_status = le32_to_cpu(rx_pkt_status);
-        } else {
-                if (!priv->last_phy_res_valid) {
-                        IWL_ERR(priv, "MPDU frame without cached PHY data\n");
-                        return 0;
-                }
-                phy_res = &priv->last_phy_res;
-                amsdu = (struct iwl_rx_mpdu_res_start *)pkt->data;
-                header = (struct ieee80211_hdr *)(pkt->data + sizeof(*amsdu));
-                len = le16_to_cpu(amsdu->byte_count);
-                rx_pkt_status = *(__le32 *)(pkt->data + sizeof(*amsdu) + len);
-                ampdu_status = iwlagn_translate_rx_status(priv,
-                                                le32_to_cpu(rx_pkt_status));
+        if (!priv->last_phy_res_valid) {
+                IWL_ERR(priv, "MPDU frame without cached PHY data\n");
+                return 0;
         }
+        phy_res = &priv->last_phy_res;
+        amsdu = (struct iwl_rx_mpdu_res_start *)pkt->data;
+        header = (struct ieee80211_hdr *)(pkt->data + sizeof(*amsdu));
+        len = le16_to_cpu(amsdu->byte_count);
+        rx_pkt_status = *(__le32 *)(pkt->data + sizeof(*amsdu) + len);
+        ampdu_status = iwlagn_translate_rx_status(priv,
+                                                  le32_to_cpu(rx_pkt_status));
 
         if ((unlikely(phy_res->cfg_phy_cnt > 20))) {
                 IWL_DEBUG_DROP(priv, "dsp size out of range [0,20]: %d\n",
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index 10e47938b635..87f465a49df1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -177,7 +177,7 @@ struct iwl_base_params {
 struct iwl_bt_params {
         bool advanced_bt_coexist;
         u8 bt_init_traffic_load;
-        u8 bt_prio_boost;
+        u32 bt_prio_boost;
         u16 agg_time_limit;
         bool bt_sco_disable;
         bool bt_session_2;
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 867d8e194da4..92576a3e84ef 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -458,6 +458,7 @@ struct iwl_trans {
         /* The following fields are internal only */
         struct kmem_cache *dev_cmd_pool;
         size_t dev_cmd_headroom;
+        char dev_cmd_pool_name[50];
 
         /* pointer to trans specific struct */
         /*Ensure that this pointer will always be aligned to sizeof pointer */
diff --git a/drivers/net/wireless/iwlwifi/pcie/2000.c b/drivers/net/wireless/iwlwifi/pcie/2000.c
index fd4e78f56fa6..9fbde32f7559 100644
--- a/drivers/net/wireless/iwlwifi/pcie/2000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/2000.c
@@ -112,7 +112,7 @@ static const struct iwl_bt_params iwl2030_bt_params = {
         .advanced_bt_coexist = true,
         .agg_time_limit = BT_AGG_THRESHOLD_DEF,
         .bt_init_traffic_load = IWL_BT_COEX_TRAFFIC_LOAD_NONE,
-        .bt_prio_boost = IWLAGN_BT_PRIO_BOOST_DEFAULT,
+        .bt_prio_boost = IWLAGN_BT_PRIO_BOOST_DEFAULT32,
         .bt_sco_disable = true,
         .bt_session_2 = true,
 };
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 203d575e4493..69bf6156fdf6 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -2080,7 +2080,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 {
         struct iwl_trans_pcie *trans_pcie;
         struct iwl_trans *trans;
-        char cmd_pool_name[100];
         u16 pci_cmd;
         int err;
 
@@ -2178,12 +2177,12 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         init_waitqueue_head(&trans->wait_command_queue);
         spin_lock_init(&trans->reg_lock);
 
-        snprintf(cmd_pool_name, sizeof(cmd_pool_name), "iwl_cmd_pool:%s",
-                 dev_name(trans->dev));
+        snprintf(trans->dev_cmd_pool_name, sizeof(trans->dev_cmd_pool_name),
+                 "iwl_cmd_pool:%s", dev_name(trans->dev));
 
         trans->dev_cmd_headroom = 0;
         trans->dev_cmd_pool =
-                kmem_cache_create(cmd_pool_name,
+                kmem_cache_create(trans->dev_cmd_pool_name,
                                   sizeof(struct iwl_device_cmd)
                                   + trans->dev_cmd_headroom,
                                   sizeof(void *),