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

Commit 7a1c9934 authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

mwifiex: support NL80211_HIDDEN_SSID_ZERO_LEN for uAP 



mwifiex uAP supports NL80211_HIDDEN_SSID_ZERO_LEN type of hidden
SSID only. NL80211_HIDDEN_SSID_ZERO_CONTENTS is not supported.

Signed-off-by: default avatarAvinash Patil <patila@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 f0e3bd23

drivers/net/wireless/mwifiex/cfg80211.c

+13 −0
Original line number Diff line number Diff line
@@ -948,6 +948,19 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy, 
		bss_cfg->ssid.ssid_len = params->ssid_len;

	}



	switch (params->hidden_ssid) {

	case NL80211_HIDDEN_SSID_NOT_IN_USE:

		bss_cfg->bcast_ssid_ctl = 1;

		break;

	case NL80211_HIDDEN_SSID_ZERO_LEN:

		bss_cfg->bcast_ssid_ctl = 0;

		break;

	case NL80211_HIDDEN_SSID_ZERO_CONTENTS:

		/* firmware doesn't support this type of hidden SSID */

	default:

		return -EINVAL;

	}



	if (mwifiex_set_secure_params(priv, bss_cfg, params)) {

		kfree(bss_cfg);

		wiphy_err(wiphy, "Failed to parse secuirty parameters!\n");

drivers/net/wireless/mwifiex/fw.h

+6 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { 
#define TLV_TYPE_CHANNELBANDLIST    (PROPRIETARY_TLV_BASE_ID + 42)

#define TLV_TYPE_UAP_BEACON_PERIOD  (PROPRIETARY_TLV_BASE_ID + 44)

#define TLV_TYPE_UAP_DTIM_PERIOD    (PROPRIETARY_TLV_BASE_ID + 45)

#define TLV_TYPE_UAP_BCAST_SSID     (PROPRIETARY_TLV_BASE_ID + 48)

#define TLV_TYPE_UAP_RTS_THRESHOLD  (PROPRIETARY_TLV_BASE_ID + 51)

#define TLV_TYPE_UAP_WPA_PASSPHRASE (PROPRIETARY_TLV_BASE_ID + 60)

#define TLV_TYPE_UAP_ENCRY_PROTOCOL (PROPRIETARY_TLV_BASE_ID + 64)
@@ -1209,6 +1210,11 @@ struct host_cmd_tlv_ssid { 
	u8 ssid[0];

} __packed;



struct host_cmd_tlv_bcast_ssid {

	struct host_cmd_tlv tlv;

	u8 bcast_ctl;

} __packed;



struct host_cmd_tlv_beacon_period {

	struct host_cmd_tlv tlv;

	__le16 period;

drivers/net/wireless/mwifiex/uap_cmd.c

+9 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size) 
	struct host_cmd_tlv_dtim_period *dtim_period;

	struct host_cmd_tlv_beacon_period *beacon_period;

	struct host_cmd_tlv_ssid *ssid;

	struct host_cmd_tlv_bcast_ssid *bcast_ssid;

	struct host_cmd_tlv_channel_band *chan_band;

	struct host_cmd_tlv_frag_threshold *frag_threshold;

	struct host_cmd_tlv_rts_threshold *rts_threshold;
@@ -153,6 +154,14 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size) 
		cmd_size += sizeof(struct host_cmd_tlv) +

			    bss_cfg->ssid.ssid_len;

		tlv += sizeof(struct host_cmd_tlv) + bss_cfg->ssid.ssid_len;



		bcast_ssid = (struct host_cmd_tlv_bcast_ssid *)tlv;

		bcast_ssid->tlv.type = cpu_to_le16(TLV_TYPE_UAP_BCAST_SSID);

		bcast_ssid->tlv.len =

				cpu_to_le16(sizeof(bcast_ssid->bcast_ctl));

		bcast_ssid->bcast_ctl = bss_cfg->bcast_ssid_ctl;

		cmd_size += sizeof(struct host_cmd_tlv_bcast_ssid);

		tlv += sizeof(struct host_cmd_tlv_bcast_ssid);

	}

	if (bss_cfg->channel && bss_cfg->channel <= MAX_CHANNEL_BAND_BG) {

		chan_band = (struct host_cmd_tlv_channel_band *)tlv;