Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 006606c0 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: remove unnecessary code in data rate configuration 



1) Remove unnecessary wrapper functions.
2) Currently we don't have command to set Tx data rate, so
mwifiex_rate_ioctl_set_rate_value() function and related code
can be removed.
3) "ds_rate" filled by mwifiex_ret_tx_rate_cfg() is never used.

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 1f45b39e

drivers/net/wireless/mwifiex/cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static int 
mwifiex_dump_station_info(struct mwifiex_private *priv,

			  struct station_info *sinfo)

{

	struct mwifiex_rate_cfg rate;

	u32 rate;



	sinfo->filled = STATION_INFO_RX_BYTES | STATION_INFO_TX_BYTES |

			STATION_INFO_RX_PACKETS | STATION_INFO_TX_PACKETS |
@@ -661,7 +661,7 @@ mwifiex_dump_station_info(struct mwifiex_private *priv, 
	sinfo->tx_packets = priv->stats.tx_packets;

	sinfo->signal = priv->bcn_rssi_avg;

	/* bit rate is in 500 kb/s units. Convert it to 100kb/s units */

	sinfo->txrate.legacy = rate.rate * 5;

	sinfo->txrate.legacy = rate * 5;



	if (priv->bss_mode == NL80211_IFTYPE_STATION) {

		sinfo->filled |= STATION_INFO_BSS_PARAM;

drivers/net/wireless/mwifiex/cfp.c

+0 −31
Original line number Diff line number Diff line
@@ -166,23 +166,6 @@ u32 mwifiex_index_to_data_rate(struct mwifiex_private *priv, u8 index, 
	return rate;

}



/*

 * This function maps a data rate value into corresponding index in supported

 * rates table.

 */

u8 mwifiex_data_rate_to_index(u32 rate)

{

	u16 *ptr;



	if (rate) {

		ptr = memchr(mwifiex_data_rates, rate,

				sizeof(mwifiex_data_rates));

		if (ptr)

			return (u8) (ptr - mwifiex_data_rates);

	}

	return 0;

}



/*

 * This function returns the current active data rates.

 *
@@ -276,20 +259,6 @@ mwifiex_is_rate_auto(struct mwifiex_private *priv) 
		return false;

}



/*

 * This function converts rate bitmap into rate index.

 */

int mwifiex_get_rate_index(u16 *rate_bitmap, int size)

{

	int i;



	for (i = 0; i < size * 8; i++)

		if (rate_bitmap[i / 16] & (1 << (i % 16)))

			return i;



	return 0;

}



/*

 * This function gets the supported data rates.

 *

drivers/net/wireless/mwifiex/decl.h

+0 −9
Original line number Diff line number Diff line
@@ -41,16 +41,7 @@ 
#define MWIFIEX_AMPDU_DEF_RXWINSIZE        16

#define MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT  0xffff



#define MWIFIEX_RATE_INDEX_HRDSSS0 0

#define MWIFIEX_RATE_INDEX_HRDSSS3 3

#define MWIFIEX_RATE_INDEX_OFDM0   4

#define MWIFIEX_RATE_INDEX_OFDM7   11

#define MWIFIEX_RATE_INDEX_MCS0    12



#define MWIFIEX_RATE_BITMAP_OFDM0  16

#define MWIFIEX_RATE_BITMAP_OFDM7  23

#define MWIFIEX_RATE_BITMAP_MCS0   32

#define MWIFIEX_RATE_BITMAP_MCS127 159



#define MWIFIEX_RX_DATA_BUF_SIZE     (4 * 1024)

#define MWIFIEX_RX_CMD_BUF_SIZE	     (2 * 1024)

drivers/net/wireless/mwifiex/ioctl.h

+0 −6
Original line number Diff line number Diff line
@@ -225,12 +225,6 @@ struct mwifiex_ds_encrypt_key { 
	u8 wapi_rxpn[WAPI_RXPN_LEN];

};



struct mwifiex_rate_cfg {

	u32 action;

	u32 is_rate_auto;

	u32 rate;

};



struct mwifiex_power_cfg {

	u32 is_power_auto;

	u32 power_level;

drivers/net/wireless/mwifiex/main.h

+1 −4
Original line number Diff line number Diff line
@@ -824,9 +824,7 @@ int mwifiex_cmd_append_vsie_tlv(struct mwifiex_private *priv, u16 vsie_mask, 
u32 mwifiex_get_active_data_rates(struct mwifiex_private *priv,

				    u8 *rates);

u32 mwifiex_get_supported_rates(struct mwifiex_private *priv, u8 *rates);

u8 mwifiex_data_rate_to_index(u32 rate);

u8 mwifiex_is_rate_auto(struct mwifiex_private *priv);

int mwifiex_get_rate_index(u16 *rateBitmap, int size);

extern u16 region_code_index[MWIFIEX_MAX_REGION_CODE];

void mwifiex_save_curr_bcn(struct mwifiex_private *priv);

void mwifiex_free_curr_bcn(struct mwifiex_private *priv);
@@ -945,8 +943,7 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss, 
int mwifiex_cancel_hs(struct mwifiex_private *priv, int cmd_type);

int mwifiex_enable_hs(struct mwifiex_adapter *adapter);

int mwifiex_disable_auto_ds(struct mwifiex_private *priv);

int mwifiex_drv_get_data_rate(struct mwifiex_private *priv,

			      struct mwifiex_rate_cfg *rate);

int mwifiex_drv_get_data_rate(struct mwifiex_private *priv, u32 *rate);

int mwifiex_request_scan(struct mwifiex_private *priv,

			 struct cfg80211_ssid *req_ssid);

int mwifiex_scan_networks(struct mwifiex_private *priv,