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

Commit c43933e6 authored by Bing Zhao's avatar Bing Zhao Committed by John W. Linville
Browse files

mwifiex: remove redundant initialization for bss_descriptor 



Initialization of bss_descriptor is unnecessary as the entire
structure will be overwritten by a memcpy followed by.

Initialize disable_11ac flag properly by setting it to true in
mwifiex_fill_new_bss_desc().

Reported-by: default avatarDoug Anderson <dianders@chromium.org>
Reviewed-by: default avatarDoug Anderson <dianders@chromium.org>
Reviewed-by: default avatarPaul Stewart <pstew@chromium.org>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d837a2ae

drivers/net/wireless/mwifiex/scan.c

+0 −29
Original line number Diff line number Diff line
@@ -1500,36 +1500,7 @@ static int mwifiex_update_curr_bss_params(struct mwifiex_private *priv, 
	if (ret)

		goto done;



	/* Update current bss descriptor parameters */

	spin_lock_irqsave(&priv->curr_bcn_buf_lock, flags);

	priv->curr_bss_params.bss_descriptor.bcn_wpa_ie = NULL;

	priv->curr_bss_params.bss_descriptor.wpa_offset = 0;

	priv->curr_bss_params.bss_descriptor.bcn_rsn_ie = NULL;

	priv->curr_bss_params.bss_descriptor.rsn_offset = 0;

	priv->curr_bss_params.bss_descriptor.bcn_wapi_ie = NULL;

	priv->curr_bss_params.bss_descriptor.wapi_offset = 0;

	priv->curr_bss_params.bss_descriptor.bcn_ht_cap = NULL;

	priv->curr_bss_params.bss_descriptor.ht_cap_offset = 0;

	priv->curr_bss_params.bss_descriptor.bcn_ht_oper = NULL;

	priv->curr_bss_params.bss_descriptor.ht_info_offset = 0;

	priv->curr_bss_params.bss_descriptor.bcn_bss_co_2040 = NULL;

	priv->curr_bss_params.bss_descriptor.bss_co_2040_offset = 0;

	priv->curr_bss_params.bss_descriptor.bcn_ext_cap = NULL;

	priv->curr_bss_params.bss_descriptor.ext_cap_offset = 0;

	priv->curr_bss_params.bss_descriptor.beacon_buf = NULL;

	priv->curr_bss_params.bss_descriptor.beacon_buf_size = 0;

	priv->curr_bss_params.bss_descriptor.bcn_vht_cap = NULL;

	priv->curr_bss_params.bss_descriptor.vht_cap_offset = 0;

	priv->curr_bss_params.bss_descriptor.bcn_vht_oper = NULL;

	priv->curr_bss_params.bss_descriptor.vht_info_offset = 0;

	priv->curr_bss_params.bss_descriptor.oper_mode = NULL;

	priv->curr_bss_params.bss_descriptor.oper_mode_offset = 0;



	/* Disable 11ac by default. Enable it only where there

	 * exist VHT_CAP IE in AP beacon

	 */

	priv->curr_bss_params.bss_descriptor.disable_11ac = true;



	/* Make a copy of current BSSID descriptor */

	memcpy(&priv->curr_bss_params.bss_descriptor, bss_desc,

	       sizeof(priv->curr_bss_params.bss_descriptor));

drivers/net/wireless/mwifiex/sta_ioctl.c

+5 −0
Original line number Diff line number Diff line
@@ -184,6 +184,11 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv, 
	else

		bss_desc->bss_mode = NL80211_IFTYPE_STATION;



	/* Disable 11ac by default. Enable it only where there

	 * exist VHT_CAP IE in AP beacon

	 */

	bss_desc->disable_11ac = true;



	return mwifiex_update_bss_desc_with_ie(priv->adapter, bss_desc);

}