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

Commit 21c3ba34 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: use IEEE80211_HT_PARAM_CHA_SEC_* macros 



Replace driver specific macros with the corresponding
IEEE80211_HT_PARAM_CHA_SEC_* macros defined in ieee80211.h.
Also, rename 'adapter->chan_offset' to 'adapter->sec_chan_offset'
for consistency.

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 43906cdb

drivers/net/wireless/mwifiex/cfg80211.c

+24 −24
Original line number Diff line number Diff line
@@ -24,26 +24,26 @@ 
 * This function maps the nl802.11 channel type into driver channel type.

 *

 * The mapping is as follows -

 *      NL80211_CHAN_NO_HT     -> NO_SEC_CHANNEL

 *      NL80211_CHAN_HT20      -> NO_SEC_CHANNEL

 *      NL80211_CHAN_HT40PLUS  -> SEC_CHANNEL_ABOVE

 *      NL80211_CHAN_HT40MINUS -> SEC_CHANNEL_BELOW

 *      Others                 -> NO_SEC_CHANNEL

 *      NL80211_CHAN_NO_HT     -> IEEE80211_HT_PARAM_CHA_SEC_NONE

 *      NL80211_CHAN_HT20      -> IEEE80211_HT_PARAM_CHA_SEC_NONE

 *      NL80211_CHAN_HT40PLUS  -> IEEE80211_HT_PARAM_CHA_SEC_ABOVE

 *      NL80211_CHAN_HT40MINUS -> IEEE80211_HT_PARAM_CHA_SEC_BELOW

 *      Others                 -> IEEE80211_HT_PARAM_CHA_SEC_NONE

 */

static int

mwifiex_cfg80211_channel_type_to_mwifiex_channels(enum nl80211_channel_type

static u8

mwifiex_cfg80211_channel_type_to_sec_chan_offset(enum nl80211_channel_type

						 channel_type)

{

	switch (channel_type) {

	case NL80211_CHAN_NO_HT:

	case NL80211_CHAN_HT20:

		return NO_SEC_CHANNEL;

		return IEEE80211_HT_PARAM_CHA_SEC_NONE;

	case NL80211_CHAN_HT40PLUS:

		return SEC_CHANNEL_ABOVE;

		return IEEE80211_HT_PARAM_CHA_SEC_ABOVE;

	case NL80211_CHAN_HT40MINUS:

		return SEC_CHANNEL_BELOW;

		return IEEE80211_HT_PARAM_CHA_SEC_BELOW;

	default:

		return NO_SEC_CHANNEL;

		return IEEE80211_HT_PARAM_CHA_SEC_NONE;

	}

}
@@ -51,20 +51,20 @@ mwifiex_cfg80211_channel_type_to_mwifiex_channels(enum nl80211_channel_type 
 * This function maps the driver channel type into nl802.11 channel type.

 *

 * The mapping is as follows -

 *      NO_SEC_CHANNEL      -> NL80211_CHAN_HT20

 *      SEC_CHANNEL_ABOVE   -> NL80211_CHAN_HT40PLUS

 *      SEC_CHANNEL_BELOW   -> NL80211_CHAN_HT40MINUS

 *      IEEE80211_HT_PARAM_CHA_SEC_NONE    -> NL80211_CHAN_HT20

 *      IEEE80211_HT_PARAM_CHA_SEC_ABOVE   -> NL80211_CHAN_HT40PLUS

 *      IEEE80211_HT_PARAM_CHA_SEC_BELOW   -> NL80211_CHAN_HT40MINUS

 *      Others                             -> NL80211_CHAN_HT20

 */

static enum nl80211_channel_type

mwifiex_channels_to_cfg80211_channel_type(int channel_type)

{

	switch (channel_type) {

	case NO_SEC_CHANNEL:

	case IEEE80211_HT_PARAM_CHA_SEC_NONE:

		return NL80211_CHAN_HT20;

	case SEC_CHANNEL_ABOVE:

	case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:

		return NL80211_CHAN_HT40PLUS;

	case SEC_CHANNEL_BELOW:

	case IEEE80211_HT_PARAM_CHA_SEC_BELOW:

		return NL80211_CHAN_HT40MINUS;

	default:

		return NL80211_CHAN_HT20;
@@ -354,15 +354,15 @@ mwifiex_set_rf_channel(struct mwifiex_private *priv, 
					adapter->adhoc_11n_enabled = false;

			}

		}

		adapter->chan_offset =

			mwifiex_cfg80211_channel_type_to_mwifiex_channels

		adapter->sec_chan_offset =

			mwifiex_cfg80211_channel_type_to_sec_chan_offset

			(channel_type);



		mwifiex_send_domain_info_cmd_fw(wiphy);

	}



	wiphy_dbg(wiphy, "info: setting band %d, channel offset %d and "

		"mode %d\n", config_bands, adapter->chan_offset,

		"mode %d\n", config_bands, adapter->sec_chan_offset,

		priv->bss_mode);

	if (!chan)

		return 0;
@@ -729,7 +729,7 @@ static int mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy, 
			adapter->adhoc_11n_enabled = false;

		}

	}

	adapter->chan_offset = NO_SEC_CHANNEL;

	adapter->sec_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE;



	wiphy_debug(wiphy, "info: device configured in 802.11%s%s mode\n",

				(mode & BAND_B) ? "b" : "",
@@ -850,7 +850,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid, 
	if (channel)

		ret = mwifiex_set_rf_channel(priv, channel,

				mwifiex_channels_to_cfg80211_channel_type

				(priv->adapter->chan_offset));

				(priv->adapter->sec_chan_offset));



	ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);	/* Disable keys */

drivers/net/wireless/mwifiex/fw.h

+0 −2
Original line number Diff line number Diff line
@@ -376,8 +376,6 @@ enum mwifiex_chan_scan_mode_bitmasks { 
	MWIFIEX_DISABLE_CHAN_FILT = BIT(1),

};



#define SECOND_CHANNEL_BELOW    0x30

#define SECOND_CHANNEL_ABOVE    0x10

struct mwifiex_chan_scan_param_set {

	u8 radio_type;

	u8 chan_number;

drivers/net/wireless/mwifiex/init.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) 
	memset(adapter->event_body, 0, sizeof(adapter->event_body));

	adapter->hw_dot_11n_dev_cap = 0;

	adapter->hw_dev_mcs_support = 0;

	adapter->chan_offset = 0;

	adapter->sec_chan_offset = 0;

	adapter->adhoc_11n_enabled = false;



	mwifiex_wmm_init(adapter);

drivers/net/wireless/mwifiex/ioctl.h

+0 −4
Original line number Diff line number Diff line
@@ -62,10 +62,6 @@ enum { 
	BAND_AN = 16,

};



#define NO_SEC_CHANNEL               0

#define SEC_CHANNEL_ABOVE            1

#define SEC_CHANNEL_BELOW            3



enum {

	ADHOC_IDLE,

	ADHOC_STARTED,

drivers/net/wireless/mwifiex/join.c

+8 −6
Original line number Diff line number Diff line
@@ -885,12 +885,14 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv, 
		       = mwifiex_band_to_radio_type(priv->curr_bss_params.band);

		if (adapter->adhoc_start_band & BAND_GN

		    || adapter->adhoc_start_band & BAND_AN) {

			if (adapter->chan_offset == SEC_CHANNEL_ABOVE)

			if (adapter->sec_chan_offset ==

					    IEEE80211_HT_PARAM_CHA_SEC_ABOVE)

				chan_tlv->chan_scan_param[0].radio_type |=

					SECOND_CHANNEL_ABOVE;

			else if (adapter->chan_offset == SEC_CHANNEL_BELOW)

					(IEEE80211_HT_PARAM_CHA_SEC_ABOVE << 4);

			else if (adapter->sec_chan_offset ==

					    IEEE80211_HT_PARAM_CHA_SEC_ABOVE)

				chan_tlv->chan_scan_param[0].radio_type |=

					SECOND_CHANNEL_BELOW;

					(IEEE80211_HT_PARAM_CHA_SEC_BELOW << 4);

		}

		dev_dbg(adapter->dev, "info: ADHOC_S_CMD: TLV Band = %d\n",

		       chan_tlv->chan_scan_param[0].radio_type);
@@ -936,8 +938,8 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv, 


		ht_info->ht_info.control_chan =

			(u8) priv->curr_bss_params.bss_descriptor.channel;

		if (adapter->chan_offset) {

			ht_info->ht_info.ht_param = adapter->chan_offset;

		if (adapter->sec_chan_offset) {

			ht_info->ht_info.ht_param = adapter->sec_chan_offset;

			ht_info->ht_info.ht_param |=

					IEEE80211_HT_PARAM_CHAN_WIDTH_ANY;

		}