Commit d32c16d2 authored by Punit Vara's avatar Punit Vara Committed by Greg Kroah-Hartman

Staging: rtl8712: Coding style warnings fix for block comments

This patch is to the rtl871x_ioctl_linux.c file that fixes up following
warnings reported by checkpatch.pl :

-Block comments use * on subsequent lines
-Block comments use a trailing */ on a separate line
Signed-off-by: default avatarPunit Vara <punitvara@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a1b42bef
...@@ -771,13 +771,13 @@ static int r871x_wx_set_pmkid(struct net_device *dev, ...@@ -771,13 +771,13 @@ static int r871x_wx_set_pmkid(struct net_device *dev,
int intReturn = false; int intReturn = false;
/* /*
There are the BSSID information in the bssid.sa_data array. * There are the BSSID information in the bssid.sa_data array.
If cmd is IW_PMKSA_FLUSH, it means the wpa_supplicant wants to clear * If cmd is IW_PMKSA_FLUSH, it means the wpa_supplicant wants to clear
all the PMKID information. If cmd is IW_PMKSA_ADD, it means the * all the PMKID information. If cmd is IW_PMKSA_ADD, it means the
wpa_supplicant wants to add a PMKID/BSSID to driver. * wpa_supplicant wants to add a PMKID/BSSID to driver.
If cmd is IW_PMKSA_REMOVE, it means the wpa_supplicant wants to * If cmd is IW_PMKSA_REMOVE, it means the wpa_supplicant wants to
remove a PMKID/BSSID from driver. * remove a PMKID/BSSID from driver.
*/ */
if (pPMK == NULL) if (pPMK == NULL)
return -EINVAL; return -EINVAL;
memcpy(strIssueBssid, pPMK->bssid.sa_data, ETH_ALEN); memcpy(strIssueBssid, pPMK->bssid.sa_data, ETH_ALEN);
...@@ -792,7 +792,8 @@ static int r871x_wx_set_pmkid(struct net_device *dev, ...@@ -792,7 +792,8 @@ static int r871x_wx_set_pmkid(struct net_device *dev,
if (!memcmp(psecuritypriv->PMKIDList[j].Bssid, if (!memcmp(psecuritypriv->PMKIDList[j].Bssid,
strIssueBssid, ETH_ALEN)) { strIssueBssid, ETH_ALEN)) {
/* BSSID is matched, the same AP => rewrite /* BSSID is matched, the same AP => rewrite
* with new PMKID. */ * with new PMKID.
*/
netdev_info(dev, "r8712u: %s: BSSID exists in the PMKList.\n", netdev_info(dev, "r8712u: %s: BSSID exists in the PMKList.\n",
__func__); __func__);
memcpy(psecuritypriv->PMKIDList[j].PMKID, memcpy(psecuritypriv->PMKIDList[j].PMKID,
...@@ -824,7 +825,8 @@ static int r871x_wx_set_pmkid(struct net_device *dev, ...@@ -824,7 +825,8 @@ static int r871x_wx_set_pmkid(struct net_device *dev,
if (!memcmp(psecuritypriv->PMKIDList[j].Bssid, if (!memcmp(psecuritypriv->PMKIDList[j].Bssid,
strIssueBssid, ETH_ALEN)) { strIssueBssid, ETH_ALEN)) {
/* BSSID is matched, the same AP => Remove /* BSSID is matched, the same AP => Remove
* this PMKID information and reset it. */ * this PMKID information and reset it.
*/
eth_zero_addr(psecuritypriv->PMKIDList[j].Bssid); eth_zero_addr(psecuritypriv->PMKIDList[j].Bssid);
psecuritypriv->PMKIDList[j].bUsed = false; psecuritypriv->PMKIDList[j].bUsed = false;
break; break;
...@@ -1561,7 +1563,8 @@ static int r8711_wx_set_enc(struct net_device *dev, ...@@ -1561,7 +1563,8 @@ static int r8711_wx_set_enc(struct net_device *dev,
} else { } else {
wep.KeyLength = 0; wep.KeyLength = 0;
if (keyindex_provided == 1) { /* set key_id only, no given if (keyindex_provided == 1) { /* set key_id only, no given
* KeyMaterial(erq->length==0).*/ * KeyMaterial(erq->length==0).
*/
padapter->securitypriv.PrivacyKeyIndex = key; padapter->securitypriv.PrivacyKeyIndex = key;
switch (padapter->securitypriv.DefKeylen[key]) { switch (padapter->securitypriv.DefKeylen[key]) {
case 5: case 5:
...@@ -2214,7 +2217,8 @@ static iw_handler r8711_handlers[] = { ...@@ -2214,7 +2217,8 @@ static iw_handler r8711_handlers[] = {
r8711_wx_set_wap, /* SIOCSIWAP */ r8711_wx_set_wap, /* SIOCSIWAP */
r8711_wx_get_wap, /* SIOCGIWAP */ r8711_wx_get_wap, /* SIOCGIWAP */
r871x_wx_set_mlme, /* request MLME operation; r871x_wx_set_mlme, /* request MLME operation;
* uses struct iw_mlme */ * uses struct iw_mlme
*/
dummy, /* SIOCGIWAPLIST -- deprecated */ dummy, /* SIOCGIWAPLIST -- deprecated */
r8711_wx_set_scan, /* SIOCSIWSCAN */ r8711_wx_set_scan, /* SIOCSIWSCAN */
r8711_wx_get_scan, /* SIOCGIWSCAN */ r8711_wx_get_scan, /* SIOCGIWSCAN */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment