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

Commit 9b930eae authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

mwifiex: common set_wiphy_params cfg80211 handler for AP and STA interface 



Add support for setting fragmentation threshold, RTS threshold
and retry limit.
Since wiphy parameters are properties of physical device,
appropriate function to set phy parameters is invoked depending
upon bss_type(STA or AP) for each virtual interface.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarKiran Divekar <dkiran@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4f02341a

drivers/net/wireless/mwifiex/cfg80211.c

+79 −20
Original line number Diff line number Diff line
@@ -428,18 +428,13 @@ mwifiex_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev, 
static int

mwifiex_set_frag(struct mwifiex_private *priv, u32 frag_thr)

{

	int ret;



	if (frag_thr < MWIFIEX_FRAG_MIN_VALUE ||

	    frag_thr > MWIFIEX_FRAG_MAX_VALUE)

		return -EINVAL;

		frag_thr = MWIFIEX_FRAG_MAX_VALUE;



	/* Send request to firmware */

	ret = mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,

	return mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,

				     HostCmd_ACT_GEN_SET, FRAG_THRESH_I,

				     &frag_thr);



	return ret;

}



/*
@@ -469,21 +464,85 @@ static int 
mwifiex_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)

{

	struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);

	struct mwifiex_private *priv = mwifiex_get_priv(adapter,

							MWIFIEX_BSS_ROLE_STA);

	int ret = 0;

	struct mwifiex_private *priv;

	struct mwifiex_uap_bss_param *bss_cfg;

	int ret, bss_started, i;



	if (changed & WIPHY_PARAM_RTS_THRESHOLD) {

		ret = mwifiex_set_rts(priv, wiphy->rts_threshold);

		if (ret)

	for (i = 0; i < adapter->priv_num; i++) {

		priv = adapter->priv[i];



		switch (priv->bss_role) {

		case MWIFIEX_BSS_ROLE_UAP:

			bss_cfg = kzalloc(sizeof(struct mwifiex_uap_bss_param),

					  GFP_KERNEL);

			if (!bss_cfg)

				return -ENOMEM;



			mwifiex_set_sys_config_invalid_data(bss_cfg);



			if (changed & WIPHY_PARAM_RTS_THRESHOLD)

				bss_cfg->rts_threshold = wiphy->rts_threshold;

			if (changed & WIPHY_PARAM_FRAG_THRESHOLD)

				bss_cfg->frag_threshold = wiphy->frag_threshold;

			if (changed & WIPHY_PARAM_RETRY_LONG)

				bss_cfg->retry_limit = wiphy->retry_long;



			bss_started = priv->bss_started;



			ret = mwifiex_send_cmd_sync(priv,

						    HostCmd_CMD_UAP_BSS_STOP,

						    HostCmd_ACT_GEN_SET, 0,

						    NULL);

			if (ret) {

				wiphy_err(wiphy, "Failed to stop the BSS\n");

				kfree(bss_cfg);

				return ret;

			}



	if (changed & WIPHY_PARAM_FRAG_THRESHOLD)

		ret = mwifiex_set_frag(priv, wiphy->frag_threshold);

			ret = mwifiex_send_cmd_async(priv,

						     HostCmd_CMD_UAP_SYS_CONFIG,

						     HostCmd_ACT_GEN_SET,

						     0, bss_cfg);



			kfree(bss_cfg);



			if (ret) {

				wiphy_err(wiphy, "Failed to set bss config\n");

				return ret;

			}



			if (!bss_started)

				break;



			ret = mwifiex_send_cmd_async(priv,

						     HostCmd_CMD_UAP_BSS_START,

						     HostCmd_ACT_GEN_SET, 0,

						     NULL);

			if (ret) {

				wiphy_err(wiphy, "Failed to start BSS\n");

				return ret;

			}



			break;

		case MWIFIEX_BSS_ROLE_STA:

			if (changed & WIPHY_PARAM_RTS_THRESHOLD) {

				ret = mwifiex_set_rts(priv,

						      wiphy->rts_threshold);

				if (ret)

					return ret;

			}

			if (changed & WIPHY_PARAM_FRAG_THRESHOLD) {

				ret = mwifiex_set_frag(priv,

						       wiphy->frag_threshold);

				if (ret)

					return ret;

			}

			break;

		}

	}



	return 0;

}



/*

 * CFG802.11 operation handler to change interface type.

drivers/net/wireless/mwifiex/decl.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#define MWIFIEX_FRAG_MIN_VALUE             (256)

#define MWIFIEX_FRAG_MAX_VALUE             (2346)



#define MWIFIEX_RETRY_LIMIT                14

#define MWIFIEX_SDIO_BLOCK_SIZE            256



#define MWIFIEX_BUF_FLAG_REQUEUED_PKT      BIT(0)

drivers/net/wireless/mwifiex/fw.h

+18 −0
Original line number Diff line number Diff line
@@ -106,9 +106,12 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { 
#define TLV_TYPE_AUTH_TYPE          (PROPRIETARY_TLV_BASE_ID + 31)

#define TLV_TYPE_STA_MAC_ADDR       (PROPRIETARY_TLV_BASE_ID + 32)

#define TLV_TYPE_CHANNELBANDLIST    (PROPRIETARY_TLV_BASE_ID + 42)

#define TLV_TYPE_UAP_RTS_THRESHOLD  (PROPRIETARY_TLV_BASE_ID + 51)

#define TLV_TYPE_UAP_FRAG_THRESHOLD (PROPRIETARY_TLV_BASE_ID + 70)

#define TLV_TYPE_RATE_DROP_CONTROL  (PROPRIETARY_TLV_BASE_ID + 82)

#define TLV_TYPE_RATE_SCOPE         (PROPRIETARY_TLV_BASE_ID + 83)

#define TLV_TYPE_POWER_GROUP        (PROPRIETARY_TLV_BASE_ID + 84)

#define TLV_TYPE_UAP_RETRY_LIMIT    (PROPRIETARY_TLV_BASE_ID + 93)

#define TLV_TYPE_WAPI_IE            (PROPRIETARY_TLV_BASE_ID + 94)

#define TLV_TYPE_MGMT_IE            (PROPRIETARY_TLV_BASE_ID + 105)

#define TLV_TYPE_AUTO_DS_PARAM      (PROPRIETARY_TLV_BASE_ID + 113)
@@ -1117,6 +1120,21 @@ struct host_cmd_ds_sys_config { 
	u8 tlv[0];

};



struct host_cmd_tlv_frag_threshold {

	struct host_cmd_tlv tlv;

	__le16 frag_thr;

} __packed;



struct host_cmd_tlv_rts_threshold {

	struct host_cmd_tlv tlv;

	__le16 rts_thr;

} __packed;



struct host_cmd_tlv_retry_limit {

	struct host_cmd_tlv tlv;

	u8 limit;

} __packed;



struct host_cmd_tlv_mac_addr {

	struct host_cmd_tlv tlv;

	u8 mac_addr[ETH_ALEN];

drivers/net/wireless/mwifiex/ioctl.h

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ enum { 
struct mwifiex_uap_bss_param {

	u8 channel;

	u8 band_cfg;

	u16 rts_threshold;

	u16 frag_threshold;

	u8 retry_limit;

};



enum {

drivers/net/wireless/mwifiex/main.h

+2 −0
Original line number Diff line number Diff line
@@ -993,6 +993,8 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy, 
					u32 *flags, struct vif_params *params);

int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev);



void mwifiex_set_sys_config_invalid_data(struct mwifiex_uap_bss_param *config);



u8 *mwifiex_11d_code_2_region(u8 code);



#ifdef CONFIG_DEBUG_FS