Commit 5e3175fb authored by Bing Zhao's avatar Bing Zhao Committed by John W. Linville

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: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 62749238
...@@ -121,7 +121,6 @@ info ...@@ -121,7 +121,6 @@ info
wmm_ac_vi = <number of packets sent to device from WMM AcVi queue> 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_be = <number of packets sent to device from WMM AcBE queue>
wmm_ac_bk = <number of packets sent to device from WMM AcBK 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> tx_buf_size = <current Tx buffer size>
curr_tx_buf_size = <current Tx buffer size> curr_tx_buf_size = <current Tx buffer size>
ps_mode = <0/1, CAM mode/PS mode> ps_mode = <0/1, CAM mode/PS mode>
......
...@@ -58,8 +58,6 @@ static struct mwifiex_debug_data items[] = { ...@@ -58,8 +58,6 @@ static struct mwifiex_debug_data items[] = {
item_addr(packets_out[WMM_AC_BE]), 1}, item_addr(packets_out[WMM_AC_BE]), 1},
{"wmm_ac_bk", item_size(packets_out[WMM_AC_BK]), {"wmm_ac_bk", item_size(packets_out[WMM_AC_BK]),
item_addr(packets_out[WMM_AC_BK]), 1}, 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), {"tx_buf_size", item_size(tx_buf_size),
item_addr(tx_buf_size), 1}, item_addr(tx_buf_size), 1},
{"curr_tx_buf_size", item_size(curr_tx_buf_size), {"curr_tx_buf_size", item_size(curr_tx_buf_size),
......
...@@ -317,7 +317,6 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) ...@@ -317,7 +317,6 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
adapter->pm_wakeup_fw_try = false; 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->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
adapter->curr_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K; adapter->curr_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
......
...@@ -178,7 +178,6 @@ struct mwifiex_ds_tx_ba_stream_tbl { ...@@ -178,7 +178,6 @@ struct mwifiex_ds_tx_ba_stream_tbl {
struct mwifiex_debug_info { struct mwifiex_debug_info {
u32 int_counter; u32 int_counter;
u32 packets_out[MAX_NUM_TID]; u32 packets_out[MAX_NUM_TID];
u32 max_tx_buf_size;
u32 tx_buf_size; u32 tx_buf_size;
u32 curr_tx_buf_size; u32 curr_tx_buf_size;
u32 tx_tbl_num; u32 tx_tbl_num;
......
...@@ -631,7 +631,6 @@ struct mwifiex_adapter { ...@@ -631,7 +631,6 @@ struct mwifiex_adapter {
/* spin lock for main process */ /* spin lock for main process */
spinlock_t main_proc_lock; spinlock_t main_proc_lock;
u32 mwifiex_processing; u32 mwifiex_processing;
u16 max_tx_buf_size;
u16 tx_buf_size; u16 tx_buf_size;
u16 curr_tx_buf_size; u16 curr_tx_buf_size;
u32 ioport; u32 ioport;
......
...@@ -935,9 +935,8 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no, ...@@ -935,9 +935,8 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,
/ MWIFIEX_SDIO_BLOCK_SIZE) / MWIFIEX_SDIO_BLOCK_SIZE)
* MWIFIEX_SDIO_BLOCK_SIZE; * MWIFIEX_SDIO_BLOCK_SIZE;
adapter->curr_tx_buf_size = adapter->tx_buf_size; adapter->curr_tx_buf_size = adapter->tx_buf_size;
dev_dbg(adapter->dev, dev_dbg(adapter->dev, "cmd: curr_tx_buf_size=%d\n",
"cmd: max_tx_buf_size=%d, tx_buf_size=%d\n", adapter->curr_tx_buf_size);
adapter->max_tx_buf_size, adapter->tx_buf_size);
if (adapter->if_ops.update_mp_end_port) if (adapter->if_ops.update_mp_end_port)
adapter->if_ops.update_mp_end_port(adapter, adapter->if_ops.update_mp_end_port(adapter,
......
...@@ -91,7 +91,7 @@ int mwifiex_get_debug_info(struct mwifiex_private *priv, ...@@ -91,7 +91,7 @@ int mwifiex_get_debug_info(struct mwifiex_private *priv,
memcpy(info->packets_out, memcpy(info->packets_out,
priv->wmm.packets_out, priv->wmm.packets_out,
sizeof(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->tx_buf_size = (u32) adapter->tx_buf_size;
info->rx_tbl_num = mwifiex_get_rx_reorder_tbl(priv, info->rx_tbl_num = mwifiex_get_rx_reorder_tbl(priv,
info->rx_tbl); info->rx_tbl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment