Skip to content

Commit fa78315

Browse files
Alberto Merciaigregkh
Alberto Merciai
authored and
gregkh
committed
staging: r8188eu: rename camelcase variable uintPeerChannel
Rename camelcase hungarian notated variable uintPeerChannel into peer_channel. Signed-off-by: Alberto Merciai <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 27aad6c commit fa78315

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

‎drivers/staging/r8188eu/os_dep/ioctl_linux.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2998,7 +2998,7 @@ static int rtw_p2p_connect(struct net_device *dev,
29982998
struct list_head *plist, *phead;
29992999
struct __queue *queue = &pmlmepriv->scanned_queue;
30003000
struct wlan_network *pnetwork = NULL;
3001-
uint uintPeerChannel = 0;
3001+
u32 peer_channel = 0;
30023002

30033003
/* Commented by Albert 20110304 */
30043004
/* The input data contains two informations. */
@@ -3028,7 +3028,7 @@ static int rtw_p2p_connect(struct net_device *dev,
30283028
while (phead != plist) {
30293029
pnetwork = container_of(plist, struct wlan_network, list);
30303030
if (!memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) {
3031-
uintPeerChannel = pnetwork->network.Configuration.DSConfig;
3031+
peer_channel = pnetwork->network.Configuration.DSConfig;
30323032
break;
30333033
}
30343034

@@ -3037,11 +3037,11 @@ static int rtw_p2p_connect(struct net_device *dev,
30373037

30383038
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
30393039

3040-
if (uintPeerChannel) {
3040+
if (peer_channel) {
30413041
memset(&pwdinfo->nego_req_info, 0x00, sizeof(struct tx_nego_req_info));
30423042
memset(&pwdinfo->groupid_info, 0x00, sizeof(struct group_id_info));
30433043

3044-
pwdinfo->nego_req_info.peer_channel_num[0] = uintPeerChannel;
3044+
pwdinfo->nego_req_info.peer_channel_num[0] = peer_channel;
30453045
memcpy(pwdinfo->nego_req_info.peerDevAddr, pnetwork->network.MacAddress, ETH_ALEN);
30463046
pwdinfo->nego_req_info.benable = true;
30473047

@@ -3076,7 +3076,7 @@ static int rtw_p2p_invite_req(struct net_device *dev,
30763076
struct list_head *plist, *phead;
30773077
struct __queue *queue = &pmlmepriv->scanned_queue;
30783078
struct wlan_network *pnetwork = NULL;
3079-
uint uintPeerChannel = 0;
3079+
uint peer_channel = 0;
30803080
u8 attr_content[50] = {0x00};
30813081
u8 *p2pie;
30823082
uint p2pielen = 0, attr_contentlen = 0;
@@ -3132,13 +3132,13 @@ static int rtw_p2p_invite_req(struct net_device *dev,
31323132
if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen)) {
31333133
/* Handle the P2P Device ID attribute of Beacon first */
31343134
if (!memcmp(attr_content, pinvite_req_info->peer_macaddr, ETH_ALEN)) {
3135-
uintPeerChannel = pnetwork->network.Configuration.DSConfig;
3135+
peer_channel = pnetwork->network.Configuration.DSConfig;
31363136
break;
31373137
}
31383138
} else if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_DEVICE_INFO, attr_content, &attr_contentlen)) {
31393139
/* Handle the P2P Device Info attribute of probe response */
31403140
if (!memcmp(attr_content, pinvite_req_info->peer_macaddr, ETH_ALEN)) {
3141-
uintPeerChannel = pnetwork->network.Configuration.DSConfig;
3141+
peer_channel = pnetwork->network.Configuration.DSConfig;
31423142
break;
31433143
}
31443144
}
@@ -3148,7 +3148,7 @@ static int rtw_p2p_invite_req(struct net_device *dev,
31483148

31493149
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
31503150

3151-
if (uintPeerChannel) {
3151+
if (peer_channel) {
31523152
/* Store the GO's bssid */
31533153
for (jj = 0, kk = 18; jj < ETH_ALEN; jj++, kk += 3)
31543154
pinvite_req_info->go_bssid[jj] = key_2char2num(extra[kk], extra[kk + 1]);
@@ -3157,12 +3157,12 @@ static int rtw_p2p_invite_req(struct net_device *dev,
31573157
pinvite_req_info->ssidlen = wrqu->data.length - 36;
31583158
memcpy(pinvite_req_info->go_ssid, &extra[36], (u32)pinvite_req_info->ssidlen);
31593159
pinvite_req_info->benable = true;
3160-
pinvite_req_info->peer_ch = uintPeerChannel;
3160+
pinvite_req_info->peer_ch = peer_channel;
31613161

31623162
rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo));
31633163
rtw_p2p_set_state(pwdinfo, P2P_STATE_TX_INVITE_REQ);
31643164

3165-
set_channel_bwmode(padapter, uintPeerChannel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
3165+
set_channel_bwmode(padapter, peer_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
31663166

31673167
_set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT);
31683168

@@ -3215,7 +3215,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
32153215
struct list_head *plist, *phead;
32163216
struct __queue *queue = &pmlmepriv->scanned_queue;
32173217
struct wlan_network *pnetwork = NULL;
3218-
uint uintPeerChannel = 0;
3218+
uint peer_channel = 0;
32193219
u8 attr_content[100] = {0x00};
32203220
u8 *p2pie;
32213221
uint p2pielen = 0, attr_contentlen = 0;
@@ -3265,7 +3265,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
32653265
plist = phead->next;
32663266

32673267
while (phead != plist) {
3268-
if (uintPeerChannel != 0)
3268+
if (peer_channel != 0)
32693269
break;
32703270

32713271
pnetwork = container_of(plist, struct wlan_network, list);
@@ -3283,13 +3283,13 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
32833283
if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen)) {
32843284
/* Handle the P2P Device ID attribute of Beacon first */
32853285
if (!memcmp(attr_content, peerMAC, ETH_ALEN)) {
3286-
uintPeerChannel = pnetwork->network.Configuration.DSConfig;
3286+
peer_channel = pnetwork->network.Configuration.DSConfig;
32873287
break;
32883288
}
32893289
} else if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_DEVICE_INFO, attr_content, &attr_contentlen)) {
32903290
/* Handle the P2P Device Info attribute of probe response */
32913291
if (!memcmp(attr_content, peerMAC, ETH_ALEN)) {
3292-
uintPeerChannel = pnetwork->network.Configuration.DSConfig;
3292+
peer_channel = pnetwork->network.Configuration.DSConfig;
32933293
break;
32943294
}
32953295
}
@@ -3304,11 +3304,11 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
33043304

33053305
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
33063306

3307-
if (uintPeerChannel) {
3308-
DBG_88E("[%s] peer channel: %d!\n", __func__, uintPeerChannel);
3307+
if (peer_channel) {
3308+
DBG_88E("[%s] peer channel: %d!\n", __func__, peer_channel);
33093309
memcpy(pwdinfo->tx_prov_disc_info.peerIFAddr, pnetwork->network.MacAddress, ETH_ALEN);
33103310
memcpy(pwdinfo->tx_prov_disc_info.peerDevAddr, peerMAC, ETH_ALEN);
3311-
pwdinfo->tx_prov_disc_info.peer_channel_num[0] = (u16)uintPeerChannel;
3311+
pwdinfo->tx_prov_disc_info.peer_channel_num[0] = (u16)peer_channel;
33123312
pwdinfo->tx_prov_disc_info.benable = true;
33133313
rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo));
33143314
rtw_p2p_set_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ);
@@ -3320,7 +3320,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
33203320
pwdinfo->tx_prov_disc_info.ssid.SsidLength = P2P_WILDCARD_SSID_LEN;
33213321
}
33223322

3323-
set_channel_bwmode(padapter, uintPeerChannel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
3323+
set_channel_bwmode(padapter, peer_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
33243324

33253325
_set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT);
33263326

0 commit comments

Comments
 (0)