staging: wilc1000: rename strStaParams variable to avoid camelCase (8ed313f1) · Commits · 戴 / test

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+22 −22

Original line number	Original line	Diff line number	Diff line
	@@ -1959,7 +1959,7 @@ static int add_station(struct wiphy wiphy, struct net_device dev,
	{		{
	s32 ret = 0;		s32 ret = 0;
	struct wilc_priv *priv;		struct wilc_priv *priv;
	struct add_sta_param strStaParams = { {0} };		struct add_sta_param sta_params = { {0} };
	struct wilc_vif *vif;		struct wilc_vif *vif;

	if (!wiphy)		if (!wiphy)
	@@ -1969,23 +1969,23 @@ static int add_station(struct wiphy wiphy, struct net_device dev,
	vif = netdev_priv(dev);		vif = netdev_priv(dev);

	if (vif->iftype == AP_MODE \|\| vif->iftype == GO_MODE) {		if (vif->iftype == AP_MODE \|\| vif->iftype == GO_MODE) {
	memcpy(strStaParams.bssid, mac, ETH_ALEN);		memcpy(sta_params.bssid, mac, ETH_ALEN);
	memcpy(priv->assoc_stainfo.sta_associated_bss[params->aid], mac, ETH_ALEN);		memcpy(priv->assoc_stainfo.sta_associated_bss[params->aid], mac, ETH_ALEN);
	strStaParams.aid = params->aid;		sta_params.aid = params->aid;
	strStaParams.rates_len = params->supported_rates_len;		sta_params.rates_len = params->supported_rates_len;
	strStaParams.rates = params->supported_rates;		sta_params.rates = params->supported_rates;

	if (!params->ht_capa) {		if (!params->ht_capa) {
	strStaParams.ht_supported = false;		sta_params.ht_supported = false;
	} else {		} else {
	strStaParams.ht_supported = true;		sta_params.ht_supported = true;
	strStaParams.ht_capa = *params->ht_capa;		sta_params.ht_capa = *params->ht_capa;
	}		}

	strStaParams.flags_mask = params->sta_flags_mask;		sta_params.flags_mask = params->sta_flags_mask;
	strStaParams.flags_set = params->sta_flags_set;		sta_params.flags_set = params->sta_flags_set;

	ret = wilc_add_station(vif, &strStaParams);		ret = wilc_add_station(vif, &sta_params);
	if (ret)		if (ret)
	netdev_err(dev, "Host add station fail\n");		netdev_err(dev, "Host add station fail\n");
	}		}
	@@ -2025,7 +2025,7 @@ static int change_station(struct wiphy wiphy, struct net_device dev,
	{		{
	s32 ret = 0;		s32 ret = 0;
	struct wilc_priv *priv;		struct wilc_priv *priv;
	struct add_sta_param strStaParams = { {0} };		struct add_sta_param sta_params = { {0} };
	struct wilc_vif *vif;		struct wilc_vif *vif;

	if (!wiphy)		if (!wiphy)
	@@ -2035,22 +2035,22 @@ static int change_station(struct wiphy wiphy, struct net_device dev,
	vif = netdev_priv(dev);		vif = netdev_priv(dev);

	if (vif->iftype == AP_MODE \|\| vif->iftype == GO_MODE) {		if (vif->iftype == AP_MODE \|\| vif->iftype == GO_MODE) {
	memcpy(strStaParams.bssid, mac, ETH_ALEN);		memcpy(sta_params.bssid, mac, ETH_ALEN);
	strStaParams.aid = params->aid;		sta_params.aid = params->aid;
	strStaParams.rates_len = params->supported_rates_len;		sta_params.rates_len = params->supported_rates_len;
	strStaParams.rates = params->supported_rates;		sta_params.rates = params->supported_rates;

	if (!params->ht_capa) {		if (!params->ht_capa) {
	strStaParams.ht_supported = false;		sta_params.ht_supported = false;
	} else {		} else {
	strStaParams.ht_supported = true;		sta_params.ht_supported = true;
	strStaParams.ht_capa = *params->ht_capa;		sta_params.ht_capa = *params->ht_capa;
	}		}

	strStaParams.flags_mask = params->sta_flags_mask;		sta_params.flags_mask = params->sta_flags_mask;
	strStaParams.flags_set = params->sta_flags_set;		sta_params.flags_set = params->sta_flags_set;

	ret = wilc_edit_station(vif, &strStaParams);		ret = wilc_edit_station(vif, &sta_params);
	if (ret)		if (ret)
	netdev_err(dev, "Host edit station fail\n");		netdev_err(dev, "Host edit station fail\n");
	}		}

Admin message