hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Joshua Clayton <stillcompiling@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Joshua Clayton 2015-08-05 17:17:21 -07:00 committed by Greg Kroah-Hartman
parent db55b1652e
commit 7fb539eda2
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/rtl8712/ieee80211.c
View File

@ -134,22 +134,20 @@ u8 *r8712_get_ie(u8 *pbuf, sint index, sint *len, sint limit)
return NULL; 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) { switch (mode) {
case WIRELESS_11B: case WIRELESS_11B:
memcpy(SupportedRates, WIFI_CCKRATES, memcpy(rates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
IEEE80211_CCK_RATE_LEN);
break; break;
case WIRELESS_11G: case WIRELESS_11G:
case WIRELESS_11A: case WIRELESS_11A:
memcpy(SupportedRates, WIFI_OFDMRATES, memcpy(rates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
IEEE80211_NUM_OFDM_RATESLEN);
break; break;
case WIRELESS_11BG: case WIRELESS_11BG:
memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN); memcpy(rates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
memcpy(SupportedRates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES, memcpy(rates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES,
IEEE80211_NUM_OFDM_RATESLEN); IEEE80211_NUM_OFDM_RATESLEN);
break; break;
} }
@ -195,17 +193,16 @@ int r8712_generate_ie(struct registry_priv *pregistrypriv)
ie = r8712_set_ie(ie, _SSID_IE_, pdev_network->Ssid.SsidLength, ie = r8712_set_ie(ie, _SSID_IE_, pdev_network->Ssid.SsidLength,
pdev_network->Ssid.Ssid, &sz); pdev_network->Ssid.Ssid, &sz);
/*supported rates*/ /*supported rates*/
set_supported_rate(pdev_network->SupportedRates, set_supported_rate(pdev_network->rates, pregistrypriv->wireless_mode);
pregistrypriv->wireless_mode); rateLen = r8712_get_rateset_len(pdev_network->rates);
rateLen = r8712_get_rateset_len(pdev_network->SupportedRates);
if (rateLen > 8) { if (rateLen > 8) {
ie = r8712_set_ie(ie, _SUPPORTEDRATES_IE_, 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), ie = r8712_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8),
(pdev_network->SupportedRates + 8), &sz); (pdev_network->rates + 8), &sz);
} else } else
ie = r8712_set_ie(ie, _SUPPORTEDRATES_IE_, ie = r8712_set_ie(ie, _SUPPORTEDRATES_IE_,
rateLen, pdev_network->SupportedRates, &sz); rateLen, pdev_network->rates, &sz);
/*DS parameter set*/ /*DS parameter set*/
ie = r8712_set_ie(ie, _DSSET_IE_, 1, ie = r8712_set_ie(ie, _DSSET_IE_, 1,
(u8 *)&(pdev_network->Configuration.DSConfig), &sz); (u8 *)&(pdev_network->Configuration.DSConfig), &sz);

18
drivers/staging/rtl8712/rtl871x_ioctl_linux.c
View File

@ -203,14 +203,12 @@ static inline char *translate_scan(struct _adapter *padapter,
} }
/* Add the protocol name */ /* Add the protocol name */
iwe.cmd = SIOCGIWNAME; iwe.cmd = SIOCGIWNAME;
if ((r8712_is_cckratesonly_included(pnetwork->network. if (r8712_is_cckratesonly_included(pnetwork->network.rates)) {
SupportedRates)) == true) {
if (ht_cap == true) if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else else
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11b"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11b");
} else if ((r8712_is_cckrates_included(pnetwork->network. } else if (r8712_is_cckrates_included(pnetwork->network.rates)) {
SupportedRates)) == true) {
if (ht_cap == true) if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
else else
@ -270,9 +268,9 @@ static inline char *translate_scan(struct _adapter *padapter,
iwe.u.bitrate.disabled = 0; iwe.u.bitrate.disabled = 0;
iwe.u.bitrate.value = 0; iwe.u.bitrate.value = 0;
i = 0; i = 0;
while (pnetwork->network.SupportedRates[i] != 0) { while (pnetwork->network.rates[i] != 0) {
/* Bit rate given in 500 kb/s units */ /* 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; 0x7F) * 500000;
current_val = iwe_stream_add_value(info, start, current_val, current_val = iwe_stream_add_value(info, start, current_val,
stop, &iwe, IW_EV_PARAM_LEN); 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); &ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0) if (p && ht_ielen > 0)
ht_cap = true; ht_cap = true;
prates = pcur_bss->SupportedRates; prates = pcur_bss->rates;
if (r8712_is_cckratesonly_included(prates) == true) { if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true) if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ, 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_20 |
IEEE80211_HT_CAP_SGI_40)) ? 1 : 0; IEEE80211_HT_CAP_SGI_40)) ? 1 : 0;
} }
while ((pcur_bss->SupportedRates[i] != 0) && while ((pcur_bss->rates[i] != 0) &&
(pcur_bss->SupportedRates[i] != 0xFF)) { (pcur_bss->rates[i] != 0xFF)) {
rate = pcur_bss->SupportedRates[i] & 0x7F; rate = pcur_bss->rates[i] & 0x7F;
if (rate > max_rate) if (rate > max_rate)
max_rate = rate; max_rate = rate;
wrqu->bitrate.fixed = 0; /* no auto select */ wrqu->bitrate.fixed = 0; /* no auto select */

2
drivers/staging/rtl8712/wlan_bssdef.h
View File

@ -88,7 +88,7 @@ struct wlan_bssid_ex {
enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
struct NDIS_802_11_CONFIGURATION Configuration; struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; 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 */ /* number of content bytes in EIs, which varies */
u32 IELength; u32 IELength;
/*(timestamp, beacon interval, and capability information) */ /*(timestamp, beacon interval, and capability information) */