mwifiex: remove max_tx_buf_size

max_tx_buf_size is not used any more after reconfiguration of
tx buffer size has been removed.

Also add missing curr_tx_buf_size update while dumping debug info
via debugfs.

Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

7 files changed, 3 insertions, 10 deletions

diff --git a/drivers/net/wireless/mwifiex/README b/drivers/net/wireless/mwifiex/README
index b55badef4660..3d64613ebb29 100644
--- a/drivers/net/wireless/mwifiex/README
+++ b/drivers/net/wireless/mwifiex/README
@@ -121,7 +121,6 @@ info
         wmm_ac_vi = <number of packets sent to device from WMM AcVi queue>
         wmm_ac_be = <number of packets sent to device from WMM AcBE queue>
         wmm_ac_bk = <number of packets sent to device from WMM AcBK queue>
-        max_tx_buf_size = <maximum Tx buffer size>
         tx_buf_size = <current Tx buffer size>
         curr_tx_buf_size = <current Tx buffer size>
         ps_mode = <0/1, CAM mode/PS mode>
diff --git a/drivers/net/wireless/mwifiex/debugfs.c b/drivers/net/wireless/mwifiex/debugfs.c
index 46e34aa65d1c..753b5682d53f 100644
--- a/drivers/net/wireless/mwifiex/debugfs.c
+++ b/drivers/net/wireless/mwifiex/debugfs.c
@@ -58,8 +58,6 @@ static struct mwifiex_debug_data items[] = {
          item_addr(packets_out[WMM_AC_BE]), 1},
         {"wmm_ac_bk", item_size(packets_out[WMM_AC_BK]),
          item_addr(packets_out[WMM_AC_BK]), 1},
-        {"max_tx_buf_size", item_size(max_tx_buf_size),
-         item_addr(max_tx_buf_size), 1},
         {"tx_buf_size", item_size(tx_buf_size),
          item_addr(tx_buf_size), 1},
         {"curr_tx_buf_size", item_size(curr_tx_buf_size),
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index e00b8060aff7..820a19cfa562 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -317,7 +317,6 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
 
         adapter->pm_wakeup_fw_try = false;
 
-        adapter->max_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
         adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
         adapter->curr_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
 
diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h
index 6095b3e53f4e..f3d9d0445529 100644
--- a/drivers/net/wireless/mwifiex/ioctl.h
+++ b/drivers/net/wireless/mwifiex/ioctl.h
@@ -178,7 +178,6 @@ struct mwifiex_ds_tx_ba_stream_tbl {
 struct mwifiex_debug_info {
         u32 int_counter;
         u32 packets_out[MAX_NUM_TID];
-        u32 max_tx_buf_size;
         u32 tx_buf_size;
         u32 curr_tx_buf_size;
         u32 tx_tbl_num;
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 51044e3ea89b..ac799a046eb7 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -631,7 +631,6 @@ struct mwifiex_adapter {
         /* spin lock for main process */
         spinlock_t main_proc_lock;
         u32 mwifiex_processing;
-        u16 max_tx_buf_size;
         u16 tx_buf_size;
         u16 curr_tx_buf_size;
         u32 ioport;
diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c
index 65c12eb3e5e7..847056415ac9 100644
--- a/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@ -935,9 +935,8 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,
                                         / MWIFIEX_SDIO_BLOCK_SIZE)
                                        * MWIFIEX_SDIO_BLOCK_SIZE;
                 adapter->curr_tx_buf_size = adapter->tx_buf_size;
-                dev_dbg(adapter->dev,
-                        "cmd: max_tx_buf_size=%d, tx_buf_size=%d\n",
-                        adapter->max_tx_buf_size, adapter->tx_buf_size);
+                dev_dbg(adapter->dev, "cmd: curr_tx_buf_size=%d\n",
+                        adapter->curr_tx_buf_size);
 
                 if (adapter->if_ops.update_mp_end_port)
                         adapter->if_ops.update_mp_end_port(adapter,
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c
index 0982375ba3b1..21553976b550 100644
--- a/drivers/net/wireless/mwifiex/util.c
+++ b/drivers/net/wireless/mwifiex/util.c
@@ -91,7 +91,7 @@ int mwifiex_get_debug_info(struct mwifiex_private *priv,
                 memcpy(info->packets_out,
                        priv->wmm.packets_out,
                        sizeof(priv->wmm.packets_out));
-                info->max_tx_buf_size = (u32) adapter->max_tx_buf_size;
+                info->curr_tx_buf_size = (u32) adapter->curr_tx_buf_size;
                 info->tx_buf_size = (u32) adapter->tx_buf_size;
                 info->rx_tbl_num = mwifiex_get_rx_reorder_tbl(priv,
                                                               info->rx_tbl);