diff options
-rw-r--r-- | drivers/net/wireless/mwifiex/11n.c | 39 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/11n.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/join.c | 2 |
3 files changed, 0 insertions, 43 deletions
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c index 9cd6216c61e6..48cc46bc152f 100644 --- a/drivers/net/wireless/mwifiex/11n.c +++ b/drivers/net/wireless/mwifiex/11n.c | |||
@@ -400,45 +400,6 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv, | |||
400 | } | 400 | } |
401 | 401 | ||
402 | /* | 402 | /* |
403 | * This function reconfigures the Tx buffer size in firmware. | ||
404 | * | ||
405 | * This function prepares a firmware command and issues it, if | ||
406 | * the current Tx buffer size is different from the one requested. | ||
407 | * Maximum configurable Tx buffer size is limited by the HT capability | ||
408 | * field value. | ||
409 | */ | ||
410 | void | ||
411 | mwifiex_cfg_tx_buf(struct mwifiex_private *priv, | ||
412 | struct mwifiex_bssdescriptor *bss_desc) | ||
413 | { | ||
414 | u16 max_amsdu = MWIFIEX_TX_DATA_BUF_SIZE_2K; | ||
415 | u16 tx_buf, curr_tx_buf_size = 0; | ||
416 | |||
417 | if (bss_desc->bcn_ht_cap) { | ||
418 | if (le16_to_cpu(bss_desc->bcn_ht_cap->cap_info) & | ||
419 | IEEE80211_HT_CAP_MAX_AMSDU) | ||
420 | max_amsdu = MWIFIEX_TX_DATA_BUF_SIZE_8K; | ||
421 | else | ||
422 | max_amsdu = MWIFIEX_TX_DATA_BUF_SIZE_4K; | ||
423 | } | ||
424 | |||
425 | tx_buf = min(priv->adapter->max_tx_buf_size, max_amsdu); | ||
426 | |||
427 | dev_dbg(priv->adapter->dev, "info: max_amsdu=%d, max_tx_buf=%d\n", | ||
428 | max_amsdu, priv->adapter->max_tx_buf_size); | ||
429 | |||
430 | if (priv->adapter->curr_tx_buf_size <= MWIFIEX_TX_DATA_BUF_SIZE_2K) | ||
431 | curr_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K; | ||
432 | else if (priv->adapter->curr_tx_buf_size <= MWIFIEX_TX_DATA_BUF_SIZE_4K) | ||
433 | curr_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K; | ||
434 | else if (priv->adapter->curr_tx_buf_size <= MWIFIEX_TX_DATA_BUF_SIZE_8K) | ||
435 | curr_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_8K; | ||
436 | if (curr_tx_buf_size != tx_buf) | ||
437 | mwifiex_send_cmd_async(priv, HostCmd_CMD_RECONFIGURE_TX_BUFF, | ||
438 | HostCmd_ACT_GEN_SET, 0, &tx_buf); | ||
439 | } | ||
440 | |||
441 | /* | ||
442 | * This function checks if the given pointer is valid entry of | 403 | * This function checks if the given pointer is valid entry of |
443 | * Tx BA Stream table. | 404 | * Tx BA Stream table. |
444 | */ | 405 | */ |
diff --git a/drivers/net/wireless/mwifiex/11n.h b/drivers/net/wireless/mwifiex/11n.h index 46006a54a656..29a4c02479d6 100644 --- a/drivers/net/wireless/mwifiex/11n.h +++ b/drivers/net/wireless/mwifiex/11n.h | |||
@@ -34,8 +34,6 @@ int mwifiex_cmd_11n_cfg(struct host_cmd_ds_command *cmd, u16 cmd_action, | |||
34 | int mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv, | 34 | int mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv, |
35 | struct mwifiex_bssdescriptor *bss_desc, | 35 | struct mwifiex_bssdescriptor *bss_desc, |
36 | u8 **buffer); | 36 | u8 **buffer); |
37 | void mwifiex_cfg_tx_buf(struct mwifiex_private *priv, | ||
38 | struct mwifiex_bssdescriptor *bss_desc); | ||
39 | void mwifiex_fill_cap_info(struct mwifiex_private *, u8 radio_type, | 37 | void mwifiex_fill_cap_info(struct mwifiex_private *, u8 radio_type, |
40 | struct mwifiex_ie_types_htcap *); | 38 | struct mwifiex_ie_types_htcap *); |
41 | int mwifiex_set_get_11n_htcap_cfg(struct mwifiex_private *priv, | 39 | int mwifiex_set_get_11n_htcap_cfg(struct mwifiex_private *priv, |
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c index f0a634d237c1..a537297866c6 100644 --- a/drivers/net/wireless/mwifiex/join.c +++ b/drivers/net/wireless/mwifiex/join.c | |||
@@ -398,8 +398,6 @@ int mwifiex_cmd_802_11_associate(struct mwifiex_private *priv, | |||
398 | 398 | ||
399 | pos = (u8 *) assoc; | 399 | pos = (u8 *) assoc; |
400 | 400 | ||
401 | mwifiex_cfg_tx_buf(priv, bss_desc); | ||
402 | |||
403 | cmd->command = cpu_to_le16(HostCmd_CMD_802_11_ASSOCIATE); | 401 | cmd->command = cpu_to_le16(HostCmd_CMD_802_11_ASSOCIATE); |
404 | 402 | ||
405 | /* Save so we know which BSS Desc to use in the response handler */ | 403 | /* Save so we know which BSS Desc to use in the response handler */ |