Commit 7fb539ed authored by Joshua Clayton's avatar Joshua Clayton Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: change SupportedRates to rates 



Change the value to a name that conforms to Linux coding style.

"rates" is equally expressive in this context, and I have left alone
a comment and function name that describe the rates as supported rates.

Signed-off-by: default avatarJoshua Clayton <stillcompiling@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db55b165

drivers/staging/rtl8712/ieee80211.c

+11 −14
Original line number Diff line number Diff line
@@ -134,22 +134,20 @@ u8 *r8712_get_ie(u8 *pbuf, sint index, sint *len, sint limit) 
	return NULL;

}



static void set_supported_rate(u8 *SupportedRates, uint mode)

static void set_supported_rate(u8 *rates, uint mode)

{

	memset(SupportedRates, 0, NDIS_802_11_LENGTH_RATES_EX);

	memset(rates, 0, NDIS_802_11_LENGTH_RATES_EX);

	switch (mode) {

	case WIRELESS_11B:

		memcpy(SupportedRates, WIFI_CCKRATES,

			IEEE80211_CCK_RATE_LEN);

		memcpy(rates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);

		break;

	case WIRELESS_11G:

	case WIRELESS_11A:

		memcpy(SupportedRates, WIFI_OFDMRATES,

			IEEE80211_NUM_OFDM_RATESLEN);

		memcpy(rates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);

		break;

	case WIRELESS_11BG:

		memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);

		memcpy(SupportedRates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES,

		memcpy(rates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);

		memcpy(rates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES,

			IEEE80211_NUM_OFDM_RATESLEN);

		break;

	}
@@ -195,17 +193,16 @@ int r8712_generate_ie(struct registry_priv *pregistrypriv) 
	ie = r8712_set_ie(ie, _SSID_IE_, pdev_network->Ssid.SsidLength,

		    pdev_network->Ssid.Ssid, &sz);

	/*supported rates*/

	set_supported_rate(pdev_network->SupportedRates,

			   pregistrypriv->wireless_mode);

	rateLen = r8712_get_rateset_len(pdev_network->SupportedRates);

	set_supported_rate(pdev_network->rates, pregistrypriv->wireless_mode);

	rateLen = r8712_get_rateset_len(pdev_network->rates);

	if (rateLen > 8) {

		ie = r8712_set_ie(ie, _SUPPORTEDRATES_IE_, 8,

			    pdev_network->SupportedRates, &sz);

			    pdev_network->rates, &sz);

		ie = r8712_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8),

			    (pdev_network->SupportedRates + 8), &sz);

			    (pdev_network->rates + 8), &sz);

	} else

		ie = r8712_set_ie(ie, _SUPPORTEDRATES_IE_,

			    rateLen, pdev_network->SupportedRates, &sz);

			    rateLen, pdev_network->rates, &sz);

	/*DS parameter set*/

	ie = r8712_set_ie(ie, _DSSET_IE_, 1,

		    (u8 *)&(pdev_network->Configuration.DSConfig), &sz);

drivers/staging/rtl8712/rtl871x_ioctl_linux.c

+8 −10
Original line number Diff line number Diff line
@@ -203,14 +203,12 @@ static inline char *translate_scan(struct _adapter *padapter, 
	}

	/* Add the protocol name */

	iwe.cmd = SIOCGIWNAME;

	if ((r8712_is_cckratesonly_included(pnetwork->network.

	     SupportedRates)) == true) {

	if (r8712_is_cckratesonly_included(pnetwork->network.rates)) {

		if (ht_cap == true)

			snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");

		else

			snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11b");

	} else if ((r8712_is_cckrates_included(pnetwork->network.

		    SupportedRates)) == true) {

	} else if (r8712_is_cckrates_included(pnetwork->network.rates)) {

		if (ht_cap == true)

			snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");

		else
@@ -270,9 +268,9 @@ static inline char *translate_scan(struct _adapter *padapter, 
	iwe.u.bitrate.disabled = 0;

	iwe.u.bitrate.value = 0;

	i = 0;

	while (pnetwork->network.SupportedRates[i] != 0) {

	while (pnetwork->network.rates[i] != 0) {

		/* Bit rate given in 500 kb/s units */

		iwe.u.bitrate.value = (pnetwork->network.SupportedRates[i++] &

		iwe.u.bitrate.value = (pnetwork->network.rates[i++] &

				      0x7F) * 500000;

		current_val = iwe_stream_add_value(info, start, current_val,

			      stop, &iwe, IW_EV_PARAM_LEN);
@@ -644,7 +642,7 @@ static int r8711_wx_get_name(struct net_device *dev, 
				 &ht_ielen, pcur_bss->IELength - 12);

		if (p && ht_ielen > 0)

			ht_cap = true;

		prates = pcur_bss->SupportedRates;

		prates = pcur_bss->rates;

		if (r8712_is_cckratesonly_included(prates) == true) {

			if (ht_cap == true)

				snprintf(wrqu->name, IFNAMSIZ,
@@ -1444,9 +1442,9 @@ static int r8711_wx_get_rate(struct net_device *dev, 
				    (IEEE80211_HT_CAP_SGI_20 |

				    IEEE80211_HT_CAP_SGI_40)) ? 1 : 0;

		}

		while ((pcur_bss->SupportedRates[i] != 0) &&

			(pcur_bss->SupportedRates[i] != 0xFF)) {

			rate = pcur_bss->SupportedRates[i] & 0x7F;

		while ((pcur_bss->rates[i] != 0) &&

			(pcur_bss->rates[i] != 0xFF)) {

			rate = pcur_bss->rates[i] & 0x7F;

			if (rate > max_rate)

				max_rate = rate;

			wrqu->bitrate.fixed = 0;	/* no auto select */

drivers/staging/rtl8712/wlan_bssdef.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ struct wlan_bssid_ex { 
	enum NDIS_802_11_NETWORK_TYPE  NetworkTypeInUse;

	struct NDIS_802_11_CONFIGURATION  Configuration;

	enum NDIS_802_11_NETWORK_INFRASTRUCTURE  InfrastructureMode;

	u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];

	u8 rates[NDIS_802_11_LENGTH_RATES_EX];

	/* number of content bytes in EIs, which varies */

	u32 IELength;

	/*(timestamp, beacon interval, and capability information) */