Commit d8d13d32 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville

mwifiex: improvements in mwifiex_ret_tx_power_cfg()

1) Move common code out of switch case handling
2) Return from the function if number of bytes left in response buffer
are less than tlv size
3) Pass pg_tlv_hdr directly instead of txp_cfg to mwifiex_get_power_level()
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent eac40d96
...@@ -338,8 +338,7 @@ static int mwifiex_get_power_level(struct mwifiex_private *priv, void *data_buf) ...@@ -338,8 +338,7 @@ static int mwifiex_get_power_level(struct mwifiex_private *priv, void *data_buf)
if (!data_buf) if (!data_buf)
return -1; return -1;
pg_tlv_hdr = (struct mwifiex_types_power_group *) pg_tlv_hdr = (struct mwifiex_types_power_group *)((u8 *)data_buf);
((u8 *) data_buf + sizeof(struct host_cmd_ds_txpwr_cfg));
pg = (struct mwifiex_power_group *) pg = (struct mwifiex_power_group *)
((u8 *) pg_tlv_hdr + sizeof(struct mwifiex_types_power_group)); ((u8 *) pg_tlv_hdr + sizeof(struct mwifiex_types_power_group));
length = le16_to_cpu(pg_tlv_hdr->length); length = le16_to_cpu(pg_tlv_hdr->length);
...@@ -383,19 +382,25 @@ static int mwifiex_ret_tx_power_cfg(struct mwifiex_private *priv, ...@@ -383,19 +382,25 @@ static int mwifiex_ret_tx_power_cfg(struct mwifiex_private *priv,
struct mwifiex_types_power_group *pg_tlv_hdr; struct mwifiex_types_power_group *pg_tlv_hdr;
struct mwifiex_power_group *pg; struct mwifiex_power_group *pg;
u16 action = le16_to_cpu(txp_cfg->action); u16 action = le16_to_cpu(txp_cfg->action);
u16 tlv_buf_left;
switch (action) {
case HostCmd_ACT_GEN_GET:
pg_tlv_hdr = (struct mwifiex_types_power_group *) pg_tlv_hdr = (struct mwifiex_types_power_group *)
((u8 *) txp_cfg + ((u8 *)txp_cfg +
sizeof(struct host_cmd_ds_txpwr_cfg)); sizeof(struct host_cmd_ds_txpwr_cfg));
pg = (struct mwifiex_power_group *) pg = (struct mwifiex_power_group *)
((u8 *) pg_tlv_hdr + ((u8 *)pg_tlv_hdr +
sizeof(struct mwifiex_types_power_group)); sizeof(struct mwifiex_types_power_group));
tlv_buf_left = le16_to_cpu(resp->size) - S_DS_GEN - sizeof(*txp_cfg);
if (tlv_buf_left <
le16_to_cpu(pg_tlv_hdr->length) + sizeof(*pg_tlv_hdr))
return 0;
switch (action) {
case HostCmd_ACT_GEN_GET:
if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING)
mwifiex_get_power_level(priv, txp_cfg); mwifiex_get_power_level(priv, pg_tlv_hdr);
priv->tx_power_level = (u16) pg->power_min; priv->tx_power_level = (u16) pg->power_min;
break; break;
...@@ -404,14 +409,6 @@ static int mwifiex_ret_tx_power_cfg(struct mwifiex_private *priv, ...@@ -404,14 +409,6 @@ static int mwifiex_ret_tx_power_cfg(struct mwifiex_private *priv,
if (!le32_to_cpu(txp_cfg->mode)) if (!le32_to_cpu(txp_cfg->mode))
break; break;
pg_tlv_hdr = (struct mwifiex_types_power_group *)
((u8 *) txp_cfg +
sizeof(struct host_cmd_ds_txpwr_cfg));
pg = (struct mwifiex_power_group *)
((u8 *) pg_tlv_hdr +
sizeof(struct mwifiex_types_power_group));
if (pg->power_max == pg->power_min) if (pg->power_max == pg->power_min)
priv->tx_power_level = (u16) pg->power_min; priv->tx_power_level = (u16) pg->power_min;
break; break;
......
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