From: Marcos Paulo de Souza <marcos.mage@gmail.com>
To: kernel-janitors@vger.kernel.org
Subject: [PATCH] drivers/staging/vt6656/iwctl.c: Remove PRINT_K macro
Date: Mon, 07 Nov 2011 03:01:25 +0000 [thread overview]
Message-ID: <1320634885-5845-1-git-send-email-marcos.mage@gmail.com> (raw)
As asked in the TODO file of the driver, the PRINT_K macro needs to be
removed.
Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
---
drivers/staging/vt6656/iwctl.c | 46 ++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 2121205..8c64928 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -157,18 +157,18 @@ int iwctl_siwscan(struct net_device *dev,
if (!(pDevice->flags & DEVICE_FLAGS_OPENED))
return -EINVAL;
- PRINT_K(" SIOCSIWSCAN\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO " SIOCSIWSCAN \n");
if (pMgmt->eScanState = WMAC_IS_SCANNING) {
// In scanning..
- PRINT_K("SIOCSIWSCAN(overlap??)-->In scanning...\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "SIOCSIWSCAN(overlap??)-->In scanning...\n");
return -EAGAIN;
}
if(pDevice->byReAssocCount > 0) { //reject scan when re-associating!
//send scan event to wpa_Supplicant
union iwreq_data wrqu;
- PRINT_K("wireless_send_event--->SIOCGIWSCAN(scan done)\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "wireless_send_event--->SIOCGIWSCAN(scan done)\n");
memset(&wrqu, 0, sizeof(wrqu));
wireless_send_event(pDevice->dev, SIOCGIWSCAN, &wrqu, NULL);
return 0;
@@ -192,7 +192,7 @@ if(pDevice->byReAssocCount > 0) { //reject scan when re-associating!
else
pItemSSID->len = req->essid_len;
pMgmt->eScanType = WMAC_SCAN_PASSIVE;
- PRINT_K("SIOCSIWSCAN:[desired_ssid=%s,len=%d]\n",((PWLAN_IE_SSID)abyScanSSID)->abySSID,
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "SIOCSIWSCAN:[desired_ssid=%s,len=%d]\n", ((PWLAN_IE_SSID)abyScanSSID)->abySSID,
((PWLAN_IE_SSID)abyScanSSID)->len);
bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, abyScanSSID);
spin_unlock_irq(&pDevice->lock);
@@ -665,7 +665,7 @@ int iwctl_siwap(struct net_device *dev,
int rc = 0;
BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00};
- PRINT_K(" SIOCSIWAP \n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO " SIOCSIWAP \n");
if (wrq->sa_family != ARPHRD_ETHER)
rc = -EINVAL;
@@ -675,7 +675,7 @@ int iwctl_siwap(struct net_device *dev,
//mike :add
if ((is_broadcast_ether_addr(pMgmt->abyDesireBSSID)) ||
(memcmp(pMgmt->abyDesireBSSID, ZeroBSSID, 6) = 0)){
- PRINT_K("SIOCSIWAP:invalid desired BSSID return!\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "SIOCSIWAP:invalid desired BSSID return!\n");
return rc;
}
//mike add: if desired AP is hidden ssid(there are two same BSSID in list),
@@ -690,7 +690,7 @@ int iwctl_siwap(struct net_device *dev,
}
}
if(uSameBssidNum >= 2) { //hit: desired AP is in hidden ssid mode!!!
- PRINT_K("SIOCSIWAP:ignore for desired AP in hidden mode\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "SIOCSIWAP:ignore for desired AP in hidden mode\n");
return rc;
}
}
@@ -811,7 +811,7 @@ int iwctl_siwessid(struct net_device *dev,
// Just send an empty SSID list
memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
memset(pMgmt->abyDesireBSSID, 0xFF,6);
- PRINT_K("set essid to 'any' \n");
+ DBG_PRT(MSG_LEVEL_INFO , KERN_INFO "set essid to 'any' \n");
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
//Unknown desired AP,so here need not associate??
return 0;
@@ -829,7 +829,7 @@ int iwctl_siwessid(struct net_device *dev,
}
else
pItemSSID->len = wrq->length;
- PRINT_K("set essid to %s \n",pItemSSID->abySSID);
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "set essid to %s\n", pItemSSID->abySSID);
//mike:need clear desiredBSSID
if(pItemSSID->len=0) {
@@ -855,7 +855,7 @@ int iwctl_siwessid(struct net_device *dev,
);
if (pCurr = NULL){
- PRINT_K("SIOCSIWESSID:hidden ssid site survey before associate.......\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "SIOCSIWESSID:hidden ssid site survey before associate.......\n");
vResetCommandTimer((void *) pDevice);
pMgmt->eScanType = WMAC_SCAN_ACTIVE;
bScheduleCommand((void *) pDevice,
@@ -875,7 +875,7 @@ int iwctl_siwessid(struct net_device *dev,
}
}
if(uSameBssidNum >= 2) { //hit: desired AP is in hidden ssid mode!!!
- PRINT_K("SIOCSIWESSID:hidden ssid directly associate.......\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "SIOCSIWESSID:hidden ssid directly associate.......\n");
vResetCommandTimer((void *) pDevice);
pMgmt->eScanType = WMAC_SCAN_PASSIVE; //this scan type,you'll submit scan result!
bScheduleCommand((void *) pDevice,
@@ -1572,20 +1572,20 @@ int iwctl_siwauth(struct net_device *dev,
case IW_AUTH_WPA_VERSION:
wpa_version = wrq->value;
if(wrq->value = IW_AUTH_WPA_VERSION_DISABLED) {
- PRINT_K("iwctl_siwauth:set WPADEV to disable at 1??????\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "iwctl_siwauth:set WPADEV to disable at 1??????\n");
//pDevice->bWPADEVUp = FALSE;
}
else if(wrq->value = IW_AUTH_WPA_VERSION_WPA) {
- PRINT_K("iwctl_siwauth:set WPADEV to WPA1******\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "iwctl_siwauth:set WPADEV to WPA1******\n");
}
else {
- PRINT_K("iwctl_siwauth:set WPADEV to WPA2******\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "iwctl_siwauth:set WPADEV to WPA2******\n");
}
//pDevice->bWPASuppWextEnabled =TRUE;
break;
case IW_AUTH_CIPHER_PAIRWISE:
pairwise = wrq->value;
- PRINT_K("iwctl_siwauth:set pairwise=%d\n",pairwise);
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "iwctl_siwauth:set pairwise=%d\n", pairwise);
if(pairwise = IW_AUTH_CIPHER_CCMP){
pDevice->eEncryptionStatus = Ndis802_11Encryption3Enabled;
}else if(pairwise = IW_AUTH_CIPHER_TKIP){
@@ -1599,7 +1599,7 @@ int iwctl_siwauth(struct net_device *dev,
break;
case IW_AUTH_CIPHER_GROUP:
- PRINT_K("iwctl_siwauth:set GROUP=%d\n",wrq->value);
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "iwctl_siwauth:set GROUP=%d\n", wrq->value);
if(wpa_version = IW_AUTH_WPA_VERSION_DISABLED)
break;
if(pairwise = IW_AUTH_CIPHER_NONE){
@@ -1611,7 +1611,7 @@ int iwctl_siwauth(struct net_device *dev,
}
break;
case IW_AUTH_KEY_MGMT:
- PRINT_K("iwctl_siwauth(wpa_version=%d):set KEY_MGMT=%d\n",wpa_version,wrq->value);
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "iwctl_siwauth(wpa_version=%d):set KEY_MGMT=%d\n", wpa_version, wrq->value);
if(wpa_version = IW_AUTH_WPA_VERSION_WPA2){
if(wrq->value = IW_AUTH_KEY_MGMT_PSK)
pMgmt->eAuthenMode = WMAC_AUTH_WPA2PSK;
@@ -1630,7 +1630,7 @@ int iwctl_siwauth(struct net_device *dev,
case IW_AUTH_DROP_UNENCRYPTED:
break;
case IW_AUTH_80211_AUTH_ALG:
- PRINT_K("iwctl_siwauth:set AUTH_ALG=%d\n",wrq->value);
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "iwctl_siwauth:set AUTH_ALG=%d\n", wrq->value);
if(wrq->value=IW_AUTH_ALG_OPEN_SYSTEM){
pMgmt->bShareKeyAlgorithmúLSE;
}else if(wrq->value=IW_AUTH_ALG_SHARED_KEY){
@@ -1658,7 +1658,7 @@ int iwctl_siwauth(struct net_device *dev,
pMgmt->bShareKeyAlgorithm = FALSE;
pMgmt->eAuthenMode = WMAC_AUTH_OPEN;
//pDevice->bWPADEVUp = FALSE;
- PRINT_K("iwctl_siwauth:set WPADEV to disaable at 2?????\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "iwctl_siwauth:set WPADEV to disaable at 2?????\n");
}
break;
@@ -1770,7 +1770,7 @@ int iwctl_siwencodeext(struct net_device *dev,
u8 key_array[64];
int ret=0;
-PRINT_K("SIOCSIWENCODEEXT...... \n");
+DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "SIOCSIWENCODEEXT...... \n");
blen = sizeof(*param);
buf = kmalloc((int)blen, (int)GFP_KERNEL);
@@ -1794,7 +1794,7 @@ switch (ext->alg) {
alg_name = WPA_ALG_CCMP;
break;
default:
- PRINT_K("Unknown alg = %d\n",ext->alg);
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Unknown alg = %d\n", ext->alg);
ret= -ENOMEM;
goto error;
}
@@ -1856,7 +1856,7 @@ if(param->u.wpa_key.alg_name = WPA_ALG_NONE) {
}
}
if(pDevice->bwextstep3 = TRUE) {
- PRINT_K("SIOCSIWENCODEEXT:Enable WPA WEXT SUPPORT!!!!!\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "SIOCSIWENCODEEXT:Enable WPA WEXT SUPPORT!!!!!\n");
pDevice->bwextstep0 = FALSE;
pDevice->bwextstep1 = FALSE;
pDevice->bwextstep2 = FALSE;
@@ -1911,7 +1911,7 @@ int iwctl_siwmlme(struct net_device *dev,
//break;
case IW_MLME_DISASSOC:
if(pDevice->bLinkPass = TRUE){
- PRINT_K("iwctl_siwmlme--->send DISASSOCIATE\n");
+ DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "iwctl_siwmlme--->send DISASSOCIATE\n");
bScheduleCommand((void *) pDevice,
WLAN_CMD_DISASSOCIATE,
NULL);
--
1.7.4.4
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next reply other threads:[~2011-11-07 3:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-07 3:01 Marcos Paulo de Souza [this message]
2011-11-07 5:43 ` [PATCH] drivers/staging/vt6656/iwctl.c: Remove PRINT_K macro Dan Carpenter
2011-11-07 10:27 ` Marcos Souza
2011-11-07 10:47 ` Dan Carpenter
2011-11-07 11:52 ` Marcos Souza
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320634885-5845-1-git-send-email-marcos.mage@gmail.com \
--to=marcos.mage@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.