mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
staging: rtl8723bs: fix camel case issue in struct wlan_bssid_ex
fix camel case issue in field Reserved in struct wlan_bssid_ex Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com> Link: https://lore.kernel.org/r/a70fd91a46fd2c75eb27824ea57ae0d87d65bf81.1627656773.git.fabioaiuto83@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
78f2b22efc
commit
76ac3b19a7
6 changed files with 19 additions and 19 deletions
|
@ -483,8 +483,8 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
|
|||
}
|
||||
|
||||
if (update_ie) {
|
||||
dst->Reserved[0] = src->Reserved[0];
|
||||
dst->Reserved[1] = src->Reserved[1];
|
||||
dst->reserved[0] = src->reserved[0];
|
||||
dst->reserved[1] = src->reserved[1];
|
||||
memcpy((u8 *)dst, (u8 *)src, get_wlan_bssid_ex_sz(src));
|
||||
}
|
||||
|
||||
|
@ -600,13 +600,13 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
|
|||
|
||||
pnetwork->last_scanned = jiffies;
|
||||
|
||||
/* target.Reserved[0]== 1, means that scanned network is a bcn frame. */
|
||||
if ((pnetwork->network.ie_length > target->ie_length) && (target->Reserved[0] == 1))
|
||||
/* target.reserved[0]== 1, means that scanned network is a bcn frame. */
|
||||
if ((pnetwork->network.ie_length > target->ie_length) && (target->reserved[0] == 1))
|
||||
update_ie = false;
|
||||
|
||||
/* probe resp(3) > beacon(1) > probe req(2) */
|
||||
if ((target->Reserved[0] != 2) &&
|
||||
(target->Reserved[0] >= pnetwork->network.Reserved[0])
|
||||
if ((target->reserved[0] != 2) &&
|
||||
(target->reserved[0] >= pnetwork->network.reserved[0])
|
||||
) {
|
||||
update_ie = true;
|
||||
} else {
|
||||
|
|
|
@ -3971,18 +3971,18 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str
|
|||
subtype = GetFrameSubType(pframe);
|
||||
|
||||
if (subtype == WIFI_BEACON) {
|
||||
bssid->Reserved[0] = 1;
|
||||
bssid->reserved[0] = 1;
|
||||
ie_offset = _BEACON_IE_OFFSET_;
|
||||
} else {
|
||||
/* FIXME : more type */
|
||||
if (subtype == WIFI_PROBERSP) {
|
||||
ie_offset = _PROBERSP_IE_OFFSET_;
|
||||
bssid->Reserved[0] = 3;
|
||||
bssid->reserved[0] = 3;
|
||||
} else if (subtype == WIFI_PROBEREQ) {
|
||||
ie_offset = _PROBEREQ_IE_OFFSET_;
|
||||
bssid->Reserved[0] = 2;
|
||||
bssid->reserved[0] = 2;
|
||||
} else {
|
||||
bssid->Reserved[0] = 0;
|
||||
bssid->reserved[0] = 0;
|
||||
ie_offset = _FIXED_IE_LENGTH_;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1223,7 +1223,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
|
|||
subtype = GetFrameSubType(pframe) >> 4;
|
||||
|
||||
if (subtype == WIFI_BEACON)
|
||||
bssid->Reserved[0] = 1;
|
||||
bssid->reserved[0] = 1;
|
||||
|
||||
bssid->length = sizeof(struct wlan_bssid_ex) - MAX_IE_SZ + len;
|
||||
|
||||
|
|
|
@ -156,7 +156,7 @@ struct wlan_bcn_info {
|
|||
struct wlan_bssid_ex {
|
||||
u32 length;
|
||||
NDIS_802_11_MAC_ADDRESS mac_address;
|
||||
u8 Reserved[2];/* 0]: IS beacon frame */
|
||||
u8 reserved[2];/* 0]: IS beacon frame */
|
||||
struct ndis_802_11_ssid ssid;
|
||||
u32 privacy;
|
||||
long rssi;/* in dBM, raw data , get from PHY) */
|
||||
|
|
|
@ -305,7 +305,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
|
|||
SetSeqNum(pwlanhdr, 0/*pmlmeext->mgnt_seq*/);
|
||||
/* pmlmeext->mgnt_seq++; */
|
||||
|
||||
if (pnetwork->network.Reserved[0] == 1) { /* WIFI_BEACON */
|
||||
if (pnetwork->network.reserved[0] == 1) { /* WIFI_BEACON */
|
||||
eth_broadcast_addr(pwlanhdr->addr1);
|
||||
SetFrameSubType(pbuf, WIFI_BEACON);
|
||||
} else {
|
||||
|
|
|
@ -84,7 +84,7 @@ static char *translate_scan(struct adapter *padapter,
|
|||
u32 i = 0;
|
||||
u8 bw_40MHz = 0, short_GI = 0;
|
||||
u16 mcs_rate = 0, vht_data_rate = 0;
|
||||
u8 ie_offset = (pnetwork->network.Reserved[0] == 2 ? 0 : 12);
|
||||
u8 ie_offset = (pnetwork->network.reserved[0] == 2 ? 0 : 12);
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
u8 ss, sq;
|
||||
|
||||
|
@ -102,7 +102,7 @@ static char *translate_scan(struct adapter *padapter,
|
|||
start = iwe_stream_add_point(info, start, stop, &iwe, pnetwork->network.ssid.ssid);
|
||||
|
||||
/* parsing HT_CAP_IE */
|
||||
if (pnetwork->network.Reserved[0] == 2) { /* Probe Request */
|
||||
if (pnetwork->network.reserved[0] == 2) { /* Probe Request */
|
||||
p = rtw_get_ie(&pnetwork->network.ies[0], WLAN_EID_HT_CAPABILITY, &ht_ielen, pnetwork->network.ie_length);
|
||||
} else {
|
||||
p = rtw_get_ie(&pnetwork->network.ies[12], WLAN_EID_HT_CAPABILITY, &ht_ielen, pnetwork->network.ie_length-12);
|
||||
|
@ -140,7 +140,7 @@ static char *translate_scan(struct adapter *padapter,
|
|||
start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN);
|
||||
|
||||
/* Add mode */
|
||||
if (pnetwork->network.Reserved[0] == 2) { /* Probe Request */
|
||||
if (pnetwork->network.reserved[0] == 2) { /* Probe Request */
|
||||
cap = 0;
|
||||
} else {
|
||||
__le16 le_tmp;
|
||||
|
@ -211,7 +211,7 @@ static char *translate_scan(struct adapter *padapter,
|
|||
start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_PARAM_LEN);
|
||||
|
||||
/* parsing WPA/WPA2 IE */
|
||||
if (pnetwork->network.Reserved[0] != 2) { /* Probe Request */
|
||||
if (pnetwork->network.reserved[0] != 2) { /* Probe Request */
|
||||
u8 *buf;
|
||||
u8 wpa_ie[255], rsn_ie[255];
|
||||
u16 wpa_len = 0, rsn_len = 0;
|
||||
|
@ -274,7 +274,7 @@ static char *translate_scan(struct adapter *padapter,
|
|||
u8 *ie_ptr;
|
||||
total_ielen = pnetwork->network.ie_length - ie_offset;
|
||||
|
||||
if (pnetwork->network.Reserved[0] == 2) { /* Probe Request */
|
||||
if (pnetwork->network.reserved[0] == 2) { /* Probe Request */
|
||||
ie_ptr = pnetwork->network.ies;
|
||||
total_ielen = pnetwork->network.ie_length;
|
||||
} else { /* Beacon or Probe Respones */
|
||||
|
@ -324,7 +324,7 @@ static char *translate_scan(struct adapter *padapter,
|
|||
if (!buf)
|
||||
goto exit;
|
||||
|
||||
pos = pnetwork->network.Reserved;
|
||||
pos = pnetwork->network.reserved;
|
||||
memset(&iwe, 0, sizeof(iwe));
|
||||
iwe.cmd = IWEVCUSTOM;
|
||||
iwe.u.data.length = scnprintf(buf, MAX_WPA_IE_LEN, "fm =%02X%02X", pos[1], pos[0]);
|
||||
|
|
Loading…
Reference in a new issue