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

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

mwifiex: use a function to replace two copies of a code fragment 



Instead of having two copies of the code for device tree cfgdata
downloading, add a function to improve the code.

Reviewed-by: default avatarPaul Stewart <pstew@chromium.org>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 63791ccd

drivers/net/wireless/mwifiex/cfg80211.c

+1 −8
Original line number Diff line number Diff line
@@ -563,14 +563,7 @@ static void mwifiex_reg_notifier(struct wiphy *wiphy, 
		memcpy(adapter->country_code, request->alpha2,

		       sizeof(request->alpha2));

		mwifiex_send_domain_info_cmd_fw(wiphy);



		if (adapter->dt_node) {

			char txpwr[] = {"marvell,00_txpwrlimit"};



			memcpy(&txpwr[8], adapter->country_code, 2);

			mwifiex_dnld_dt_cfgdata(priv, adapter->dt_node,

						txpwr);

		}

		mwifiex_dnld_txpwr_table(priv);

	}

}

drivers/net/wireless/mwifiex/main.h

+1 −0
Original line number Diff line number Diff line
@@ -1155,6 +1155,7 @@ void mwifiex_11h_process_join(struct mwifiex_private *priv, u8 **buffer, 
int mwifiex_11h_handle_event_chanswann(struct mwifiex_private *priv);

int mwifiex_dnld_dt_cfgdata(struct mwifiex_private *priv,

			    struct device_node *node, const char *prefix);

void mwifiex_dnld_txpwr_table(struct mwifiex_private *priv);



extern const struct ethtool_ops mwifiex_ethtool_ops;

drivers/net/wireless/mwifiex/sta_ioctl.c

+11 −6
Original line number Diff line number Diff line
@@ -184,6 +184,16 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv, 
	return mwifiex_update_bss_desc_with_ie(priv->adapter, bss_desc);

}



void mwifiex_dnld_txpwr_table(struct mwifiex_private *priv)

{

	if (priv->adapter->dt_node) {

		char txpwr[] = {"marvell,00_txpwrlimit"};



		memcpy(&txpwr[8], priv->adapter->country_code, 2);

		mwifiex_dnld_dt_cfgdata(priv, priv->adapter->dt_node, txpwr);

	}

}



static int mwifiex_process_country_ie(struct mwifiex_private *priv,

				      struct cfg80211_bss *bss)

{
@@ -234,12 +244,7 @@ static int mwifiex_process_country_ie(struct mwifiex_private *priv, 
		return -1;

	}



	if (priv->adapter->dt_node) {

		char txpwr[] = {"marvell,00_txpwrlimit"};



		memcpy(&txpwr[8], priv->adapter->country_code, 2);

		mwifiex_dnld_dt_cfgdata(priv, priv->adapter->dt_node, txpwr);

	}

	mwifiex_dnld_txpwr_table(priv);



	return 0;

}