Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/otus/ioctl.c | 250 +++++++++++++++++---------------------
drivers/staging/otus/usbdrv.c | 20 ++--
drivers/staging/otus/wrap_ev.c | 4 +-
drivers/staging/otus/wrap_sec.c | 8 +-
drivers/staging/otus/wrap_usb.c | 10 +-
drivers/staging/otus/wwrap.c | 46 ++++----
drivers/staging/otus/zdusb.c | 18 ++--
7 files changed, 165 insertions(+), 191 deletions(-)
diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c
index 6808e69..3a72b67 100644
--- a/drivers/staging/otus/ioctl.c
+++ b/drivers/staging/otus/ioctl.c
@@ -165,7 +165,7 @@ int usbdrv_ioctl_setessid(struct net_device *dev, struct iw_point *erq)
memset(essidbuf, 0, sizeof(essidbuf));
- printk(KERN_ERR "usbdrv_ioctl_setessid\n");
+ pr_err("usbdrv_ioctl_setessid\n");
/* printk("ssidlen=%d\n", erq->length); //for any, it is 1. */
if (erq->flags) {
@@ -179,12 +179,12 @@ int usbdrv_ioctl_setessid(struct net_device *dev, struct iw_point *erq)
/* zd_DisasocAll(2); */
/* wait_ms(100); */
- printk(KERN_ERR "essidbuf: ");
+ pr_err("essidbuf: ");
for (i = 0; i < erq->length; i++)
- printk(KERN_ERR "%02x ", essidbuf[i]);
+ pr_err("%02x ", essidbuf[i]);
- printk(KERN_ERR "\n");
+ pr_err("\n");
essidbuf[erq->length] = '\0';
/* memcpy(macp->wd.ws.ssid, essidbuf, erq->length); */
@@ -193,12 +193,12 @@ int usbdrv_ioctl_setessid(struct net_device *dev, struct iw_point *erq)
zfiWlanSetSSID(dev, essidbuf, erq->length);
#if 0
- printk(KERN_ERR "macp->wd.ws.ssid: ");
+ pr_err("macp->wd.ws.ssid: ");
for (i = 0; i < macp->wd.ws.ssidLen; i++)
- printk(KERN_ERR "%02x ", macp->wd.ws.ssid[i]);
+ pr_err("%02x ", macp->wd.ws.ssid[i]);
- printk(KERN_ERR "\n");
+ pr_err("\n");
#endif
zfiWlanDisable(dev, 0);
@@ -223,12 +223,12 @@ int usbdrv_ioctl_getessid(struct net_device *dev, struct iw_point *erq)
essidbuf[len] = 0;
- printk(KERN_ERR "ESSID: ");
+ pr_err("ESSID: ");
for (i = 0; i < len; i++)
- printk(KERN_ERR "%c", essidbuf[i]);
+ pr_err("%c", essidbuf[i]);
- printk(KERN_ERR "\n");
+ pr_err("\n");
erq->flags = 1;
erq->length = strlen(essidbuf) + 1;
@@ -850,7 +850,7 @@ int usbdrvwext_siwscan(struct net_device *dev, struct iw_request_info *info,
if (macp->DeviceOpened != 1)
return 0;
- printk(KERN_WARNING "CWY - usbdrvwext_siwscan\n");
+ pr_warning("CWY - usbdrvwext_siwscan\n");
zfiWlanScan(dev);
@@ -880,7 +880,7 @@ int usbdrvwext_giwscan(struct net_device *dev,
else
end_buf = extra + data->length;
- printk(KERN_WARNING "giwscan - Report Scan Results\n");
+ pr_warning("giwscan - Report Scan Results\n");
/* printk("giwscan - BssList Sreucture Len : %d\n", sizeof(BssList));
* printk("giwscan - BssList Count : %d\n",
* wd->sta.pBssList->bssCount);
@@ -891,8 +891,8 @@ int usbdrvwext_giwscan(struct net_device *dev,
/* zfiWlanQueryBssList(dev, &BssList); */
/* Read and parse all entries */
- printk(KERN_WARNING "giwscan - pBssList->bssCount : %d\n",
- pBssList->bssCount);
+ pr_warning("giwscan - pBssList->bssCount : %d\n",
+ pBssList->bssCount);
/* printk("giwscan - BssList.bssCount : %d\n", BssList.bssCount); */
for (i = 0; i < pBssList->bssCount; i++) {
@@ -1061,7 +1061,7 @@ int usbdrvwext_siwrate(struct net_device *dev,
/* printk("Index : %x\n", i); */
if (RateKbps == 65000) {
RateIndex = 20;
- printk(KERN_WARNING "RateIndex : %d\n", RateIndex);
+ pr_warning("RateIndex : %d\n", RateIndex);
}
if (macp->DeviceOpened == 1) {
@@ -1306,7 +1306,7 @@ int usbdrvwext_giwencode(struct net_device *dev,
break;
default:
keyLen = 0;
- printk(KERN_ERR "Unknown EncryMode\n");
+ pr_err("Unknown EncryMode\n");
break;
}
erq->length = keyLen;
@@ -1897,16 +1897,12 @@ int zfLnxPrivateIoctl(struct net_device *dev, struct zdap_ioctl* zdreq)
break;
case ZM_IOCTL_MEM_READ:
p = (u32_t *) bus_to_virt(zdreq->addr);
- printk(KERN_WARNING
- "usbdrv: read memory addr: 0x%08x value:"
- " 0x%08x\n", zdreq->addr, *p);
+ pr_warning("usbdrv: read memory addr: 0x%08x value: 0x%08x\n", zdreq->addr, *p);
break;
case ZM_IOCTL_MEM_WRITE:
p = (u32_t *) bus_to_virt(zdreq->addr);
*p = zdreq->value;
- printk(KERN_WARNING
- "usbdrv : write value : 0x%08x to memory addr :"
- " 0x%08x\n", zdreq->value, zdreq->addr);
+ pr_warning("usbdrv : write value : 0x%08x to memory addr : 0x%08x\n", zdreq->value, zdreq->addr);
break;
case ZM_IOCTL_TALLY:
zfiWlanShowTally(dev);
@@ -1914,20 +1910,19 @@ int zfLnxPrivateIoctl(struct net_device *dev, struct zdap_ioctl* zdreq)
zfiWlanResetTally(dev);
break;
case ZM_IOCTL_TEST:
- printk(KERN_WARNING
- "ZM_IOCTL_TEST:len=%d\n", zdreq->addr);
+ pr_warning("ZM_IOCTL_TEST:len=%d\n", zdreq->addr);
/* zfiWlanReadReg(dev, 0x10f400); */
/* zfiWlanReadReg(dev, 0x10f404); */
- printk(KERN_WARNING "IOCTL TEST\n");
+ pr_warning("IOCTL TEST\n");
#if 1
/* print packet */
for (i = 0; i < zdreq->addr; i++) {
if ((i&0x7) == 0)
- printk(KERN_WARNING "\n");
- printk(KERN_WARNING "%02X ",
+ pr_warning("\n");
+ pr_warning("%02X ",
(unsigned char)zdreq->data[i]);
}
- printk(KERN_WARNING "\n");
+ pr_warning("\n");
#endif
/* For Test?? 1 to 0 by CWYang(-) */
@@ -1967,9 +1962,8 @@ int zfLnxPrivateIoctl(struct net_device *dev, struct zdap_ioctl* zdreq)
for (i = 0; i < zdreq->addr; i++)
key[i] = zdreq->data[i];
- printk(KERN_WARNING
- "key len=%d, key=%02x%02x%02x%02x%02x...\n",
- zdreq->addr, key[0], key[1], key[2], key[3], key[4]);
+ pr_warning("key len=%d, key=%02x%02x%02x%02x%02x...\n",
+ zdreq->addr, key[0], key[1], key[2], key[3], key[4]);
keyInfo.keyLength = zdreq->addr;
keyInfo.keyIndex = 0;
@@ -1991,16 +1985,14 @@ int zfLnxPrivateIoctl(struct net_device *dev, struct zdap_ioctl* zdreq)
case ZM_IOCTL_SIGNAL_STRENGTH: {
u8_t buffer[2];
zfiWlanQuerySignalInfo(dev, &buffer[0]);
- printk(KERN_WARNING
- "Current Signal Strength : %02d\n", buffer[0]);
+ pr_warning("Current Signal Strength : %02d\n", buffer[0]);
}
break;
/* CWYang(+) */
case ZM_IOCTL_SIGNAL_QUALITY: {
u8_t buffer[2];
zfiWlanQuerySignalInfo(dev, &buffer[0]);
- printk(KERN_WARNING
- "Current Signal Quality : %02d\n", buffer[1]);
+ pr_warning("Current Signal Quality : %02d\n", buffer[1]);
}
break;
case ZM_IOCTL_SET_PIBSS_MODE:
@@ -2014,7 +2006,7 @@ int zfLnxPrivateIoctl(struct net_device *dev, struct zdap_ioctl* zdreq)
break;
/********************* ZDCONFIG ***********************/
default:
- printk(KERN_ERR "usbdrv: error command = %x\n", cmd);
+ pr_err("usbdrv: error command = %x\n", cmd);
break;
}
@@ -2083,7 +2075,7 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
*/
}
- printk(KERN_ERR "Set Encryption Type NONE\n");
+ pr_err("Set Encryption Type NONE\n");
return ret;
} else if (!strcmp(zdparm->u.crypt.alg, "TKIP")) {
zfiWlanSetEncryMode(dev, ZM_TKIP);
@@ -2153,15 +2145,13 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
/* DUMP key context */
/* #ifdef WPA_DEBUG */
if (keyInfo.keyLength > 0) {
- printk(KERN_WARNING
- "Otus: Key Context:\n");
+ pr_warning("Otus: Key Context:\n");
for (ii = 0; ii < keyInfo.keyLength; ) {
- printk(KERN_WARNING
- "0x%02x ", keyInfo.key[ii]);
+ pr_warning("0x%02x ", keyInfo.key[ii]);
if ((++ii % 16) == 0)
- printk(KERN_WARNING "\n");
+ pr_warning("\n");
}
- printk(KERN_WARNING "\n");
+ pr_warning("\n");
}
/* #endif */
@@ -2182,7 +2172,7 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
/* zfiWlanEnable(dev); */
break;
case ZD_CMD_SET_MLME:
- printk(KERN_ERR "usbdrv_wpa_ioctl: ZD_CMD_SET_MLME\n");
+ pr_err("usbdrv_wpa_ioctl: ZD_CMD_SET_MLME\n");
/* Translate STA's address */
sprintf(mac_addr, "%02x:%02x:%02x:%02x:%02x:%02x",
@@ -2192,51 +2182,46 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
switch (zdparm->u.mlme.cmd) {
case MLME_STA_DEAUTH:
- printk(KERN_WARNING
- " -------Call zfiWlanDeauth, reason:%d\n",
- zdparm->u.mlme.reason_code);
+ pr_warning(" -------Call zfiWlanDeauth, reason:%d\n",
+ zdparm->u.mlme.reason_code);
if (zfiWlanDeauth(dev, (u16_t *) zdparm->sta_addr,
zdparm->u.mlme.reason_code) != 0)
- printk(KERN_ERR "Can't deauthencate STA: %s\n",
- mac_addr);
+ pr_err("Can't deauthencate STA: %s\n",
+ mac_addr);
else
- printk(KERN_ERR "Deauthenticate STA: %s"
- "with reason code: %d\n",
- mac_addr, zdparm->u.mlme.reason_code);
+ pr_err("Deauthenticate STA: %swith reason code: %d\n",
+ mac_addr, zdparm->u.mlme.reason_code);
break;
case MLME_STA_DISASSOC:
- printk(KERN_WARNING
- " -------Call zfiWlanDeauth, reason:%d\n",
- zdparm->u.mlme.reason_code);
+ pr_warning(" -------Call zfiWlanDeauth, reason:%d\n",
+ zdparm->u.mlme.reason_code);
if (zfiWlanDeauth(dev, (u16_t *) zdparm->sta_addr,
zdparm->u.mlme.reason_code) != 0)
- printk(KERN_ERR "Can't disassociate STA: %s\n",
- mac_addr);
+ pr_err("Can't disassociate STA: %s\n",
+ mac_addr);
else
- printk(KERN_ERR "Disassociate STA: %s"
- "with reason code: %d\n",
- mac_addr, zdparm->u.mlme.reason_code);
+ pr_err("Disassociate STA: %swith reason code: %d\n",
+ mac_addr, zdparm->u.mlme.reason_code);
break;
default:
- printk(KERN_ERR "MLME command: 0x%04x not support\n",
- zdparm->u.mlme.cmd);
+ pr_err("MLME command: 0x%04x not support\n",
+ zdparm->u.mlme.cmd);
break;
}
break;
case ZD_CMD_SCAN_REQ:
- printk(KERN_ERR "usbdrv_wpa_ioctl: ZD_CMD_SCAN_REQ\n");
+ pr_err("usbdrv_wpa_ioctl: ZD_CMD_SCAN_REQ\n");
break;
case ZD_CMD_SET_GENERIC_ELEMENT:
- printk(KERN_ERR "usbdrv_wpa_ioctl:"
- " ZD_CMD_SET_GENERIC_ELEMENT\n");
+ pr_err("usbdrv_wpa_ioctl: ZD_CMD_SET_GENERIC_ELEMENT\n");
/* Copy the WPA IE
* zm_msg1_mm(ZM_LV_0, "CWY - wpaie Length : ",
* zdparm->u.generic_elem.len);
*/
- printk(KERN_ERR "wpaie Length : % d\n",
- zdparm->u.generic_elem.len);
+ pr_err("wpaie Length : % d\n",
+ zdparm->u.generic_elem.len);
if (zfiWlanQueryWlanMode(dev) == ZM_MODE_AP) {
/* AP Mode */
zfiWlanSetWpaIe(dev, zdparm->u.generic_elem.data,
@@ -2253,22 +2238,22 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
u8_t len = zdparm->u.generic_elem.len;
u8_t *wpaie = (u8_t *)zdparm->u.generic_elem.data;
- printk(KERN_ERR "wd->ap.wpaLen : % d\n", len);
+ pr_err("wd->ap.wpaLen : % d\n", len);
/* DUMP WPA IE */
for(ii = 0; ii < len;) {
- printk(KERN_ERR "0x%02x ", wpaie[ii]);
+ pr_err("0x%02x ", wpaie[ii]);
if((++ii % 16) == 0)
- printk(KERN_ERR "\n");
+ pr_err("\n");
}
- printk(KERN_ERR "\n");
+ pr_err("\n");
/* #ifdef ZM_HOSTAPD_SUPPORT
* if (wd->wlanMode == ZM_MODE_AP)
* {// Update Beacon FIFO in the next TBTT.
* memcpy(&mWPAIe, pSetting->WPAIe, pSetting->WPAIeLen);
- * printk(KERN_ERR "Copy WPA IE into mWPAIe\n");
+ * pr_err("Copy WPA IE into mWPAIe\n");
* }
* #endif
*/
@@ -2276,13 +2261,13 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
/* #ifdef ZM_HOSTAPD_SUPPORT */
case ZD_CMD_GET_TSC:
- printk(KERN_ERR "usbdrv_wpa_ioctl : ZD_CMD_GET_TSC\n");
+ pr_err("usbdrv_wpa_ioctl : ZD_CMD_GET_TSC\n");
break;
/* #endif */
default:
- printk(KERN_ERR "usbdrv_wpa_ioctl default : 0x%04x\n",
- zdparm->cmd);
+ pr_err("usbdrv_wpa_ioctl default : 0x%04x\n",
+ zdparm->cmd);
ret = -EINVAL;
break;
}
@@ -2311,33 +2296,33 @@ int usbdrv_cenc_ioctl(struct net_device *dev, struct zydas_cenc_param *zdparm)
switch (zdparm->cmd) {
case ZM_CMD_CENC_SETCENC:
- printk(KERN_ERR "ZM_CMD_CENC_SETCENC\n");
- printk(KERN_ERR "length : % d\n", zdparm->len);
- printk(KERN_ERR "policy : % d\n", zdparm->u.info.cenc_policy);
+ pr_err("ZM_CMD_CENC_SETCENC\n");
+ pr_err("length : % d\n", zdparm->len);
+ pr_err("policy : % d\n", zdparm->u.info.cenc_policy);
break;
case ZM_CMD_CENC_SETKEY:
/* ret = wai_ioctl_setkey(vap, ioctl_msg); */
- printk(KERN_ERR "ZM_CMD_CENC_SETKEY\n");
+ pr_err("ZM_CMD_CENC_SETKEY\n");
- printk(KERN_ERR "MAC address = ");
+ pr_err("MAC address = ");
for (ii = 0; ii < 6; ii++) {
- printk(KERN_ERR "0x%02x ",
- zdparm->u.crypt.sta_addr[ii]);
+ pr_err("0x%02x ",
+ zdparm->u.crypt.sta_addr[ii]);
}
- printk(KERN_ERR "\n");
+ pr_err("\n");
- printk(KERN_ERR "Key Index : % d\n", zdparm->u.crypt.keyid);
- printk(KERN_ERR "Encryption key = ");
+ pr_err("Key Index : % d\n", zdparm->u.crypt.keyid);
+ pr_err("Encryption key = ");
for (ii = 0; ii < 16; ii++) {
- printk(KERN_ERR "0x%02x ", zdparm->u.crypt.key[ii]);
+ pr_err("0x%02x ", zdparm->u.crypt.key[ii]);
}
- printk(KERN_ERR "\n");
+ pr_err("\n");
- printk(KERN_ERR "MIC key = ");
+ pr_err("MIC key = ");
for(ii = 16; ii < ZM_CENC_KEY_SIZE; ii++) {
- printk(KERN_ERR "0x%02x ", zdparm->u.crypt.key[ii]);
+ pr_err("0x%02x ", zdparm->u.crypt.key[ii]);
}
- printk(KERN_ERR "\n");
+ pr_err("\n");
/* Set up key information */
keyInfo.keyLength = ZM_CENC_KEY_SIZE;
@@ -2361,7 +2346,7 @@ int usbdrv_cenc_ioctl(struct net_device *dev, struct zydas_cenc_param *zdparm)
break;
case ZM_CMD_CENC_REKEY:
/* ret = wai_ioctl_rekey(vap, ioctl_msg); */
- printk(KERN_ERR "ZM_CMD_CENC_REKEY\n");
+ pr_err("ZM_CMD_CENC_REKEY\n");
break;
default:
ret = -EOPNOTSUPP;
@@ -2406,7 +2391,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
err = usbdrvwext_giwmode(dev, NULL, &wrq->u.mode, NULL);
break;
case SIOCSIWESSID:
- printk(KERN_ERR "CWY - usbdrvwext_siwessid\n");
+ pr_err("CWY - usbdrvwext_siwessid\n");
/* err = usbdrv_ioctl_setessid(dev, &wrq->u.essid); */
err = usbdrvwext_siwessid(dev, NULL, &wrq->u.essid, NULL);
@@ -2485,14 +2470,13 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
/* debug command */
case ZDAPIOCTL:
if (copy_from_user(&zdreq, ifr->ifr_data, sizeof(zdreq))) {
- printk(KERN_ERR "usbdrv : copy_from_user error\n");
+ pr_err("usbdrv : copy_from_user error\n");
return -EFAULT;
}
- /* printk(KERN_WARNING
- * "usbdrv : cmd = % 2x, reg = 0x%04lx,
- *value = 0x%08lx\n",
- * zdreq.cmd, zdreq.addr, zdreq.value);
+ /* pr_warning(* "usbdrv : cmd = % 2x, reg = 0x%04lx,
+ *value = 0x%08lx\n",
+ * zdreq.cmd, zdreq.addr, zdreq.value);
*/
zfLnxPrivateIoctl(dev, &zdreq);
@@ -2501,7 +2485,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
case ZD_IOCTL_WPA:
if (copy_from_user(&zdparm, ifr->ifr_data,
sizeof(struct athr_wlan_param))) {
- printk(KERN_ERR "usbdrv : copy_from_user error\n");
+ pr_err("usbdrv : copy_from_user error\n");
return -EFAULT;
}
@@ -2521,35 +2505,34 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
arg = *p;
if (op == ZD_PARAM_ROAMING) {
- printk(KERN_ERR
- "*************ZD_PARAM_ROAMING : % d\n", arg);
+ pr_err("*************ZD_PARAM_ROAMING : % d\n", arg);
/* macp->cardSetting.ap_scan=(U8)arg; */
}
if (op == ZD_PARAM_PRIVACY) {
- printk(KERN_ERR "ZD_IOCTL_PRIVACY : ");
+ pr_err("ZD_IOCTL_PRIVACY : ");
/* Turn on the privacy invoke flag */
if (arg) {
/* mCap[0] |= CAP_PRIVACY; */
/* macp->cardSetting.EncryOnOff[0] = 1; */
- printk(KERN_ERR "enable\n");
+ pr_err("enable\n");
} else {
/* mCap[0] &= ~CAP_PRIVACY; */
/* macp->cardSetting.EncryOnOff[0] = 0; */
- printk(KERN_ERR "disable\n");
+ pr_err("disable\n");
}
/* changed=1; */
}
if (op == ZD_PARAM_WPA) {
- printk(KERN_ERR "ZD_PARAM_WPA : ");
+ pr_err("ZD_PARAM_WPA : ");
if (arg) {
- printk(KERN_ERR "enable\n");
+ pr_err("enable\n");
if (zfiWlanQueryWlanMode(dev) != ZM_MODE_AP) {
- printk(KERN_ERR "Station Mode\n");
+ pr_err("Station Mode\n");
/* zfiWlanQueryWpaIe(dev, (u8_t *)
&wpaIe, &wpalen); */
/* printk("wpaIe : % 2x, % 2x, % 2x\n",
@@ -2559,8 +2542,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if ((macp->supIe[21] == 0x50) &&
(macp->supIe[22] == 0xf2) &&
(macp->supIe[23] == 0x2)) {
- printk(KERN_ERR
- "wd->sta.authMode = ZM_AUTH_MODE_WPAPSK\n");
+ pr_err("wd->sta.authMode = ZM_AUTH_MODE_WPAPSK\n");
/* wd->sta.authMode = ZM_AUTH_MODE_WPAPSK; */
/* wd->ws.authMode = ZM_AUTH_MODE_WPAPSK; */
zfiWlanSetAuthenticationMode(dev,
@@ -2568,8 +2550,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
} else if ((macp->supIe[21] == 0x50) &&
(macp->supIe[22] == 0xf2) &&
(macp->supIe[23] == 0x1)) {
- printk(KERN_ERR
- "wd->sta.authMode = ZM_AUTH_MODE_WPA\n");
+ pr_err("wd->sta.authMode = ZM_AUTH_MODE_WPA\n");
/* wd->sta.authMode = ZM_AUTH_MODE_WPA; */
/* wd->ws.authMode = ZM_AUTH_MODE_WPA; */
zfiWlanSetAuthenticationMode(dev,
@@ -2578,8 +2559,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
(macp->supIe[18] == 0xac) &&
(macp->supIe[19] == 0x2))
{
- printk(KERN_ERR
- "wd->sta.authMode = ZM_AUTH_MODE_WPA2PSK\n");
+ pr_err("wd->sta.authMode = ZM_AUTH_MODE_WPA2PSK\n");
/* wd->sta.authMode = ZM_AUTH_MODE_WPA2PSK; */
/* wd->ws.authMode = ZM_AUTH_MODE_WPA2PSK; */
zfiWlanSetAuthenticationMode(dev,
@@ -2588,8 +2568,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
(macp->supIe[18] == 0xac) &&
(macp->supIe[19] == 0x1))
{
- printk(KERN_ERR
- "wd->sta.authMode = ZM_AUTH_MODE_WPA2\n");
+ pr_err("wd->sta.authMode = ZM_AUTH_MODE_WPA2\n");
/* wd->sta.authMode = ZM_AUTH_MODE_WPA2; */
/* wd->ws.authMode = ZM_AUTH_MODE_WPA2; */
zfiWlanSetAuthenticationMode(dev,
@@ -2599,14 +2578,12 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if ((macp->supIe[21] == 0x50) ||
(macp->supIe[22] == 0xf2)) {
if (macp->supIe[11] == 0x2) {
- printk(KERN_ERR
- "wd->sta.wepStatus = ZM_ENCRYPTION_TKIP\n");
+ pr_err("wd->sta.wepStatus = ZM_ENCRYPTION_TKIP\n");
/* wd->sta.wepStatus = ZM_ENCRYPTION_TKIP; */
/* wd->ws.wepStatus = ZM_ENCRYPTION_TKIP; */
zfiWlanSetWepStatus(dev, ZM_ENCRYPTION_TKIP);
} else {
- printk(KERN_ERR
- "wd->sta.wepStatus = ZM_ENCRYPTION_AES\n");
+ pr_err("wd->sta.wepStatus = ZM_ENCRYPTION_AES\n");
/* wd->sta.wepStatus = ZM_ENCRYPTION_AES; */
/* wd->ws.wepStatus = ZM_ENCRYPTION_AES; */
zfiWlanSetWepStatus(dev, ZM_ENCRYPTION_AES);
@@ -2616,14 +2593,12 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if ((macp->supIe[17] == 0xf) ||
(macp->supIe[18] == 0xac)) {
if (macp->supIe[13] == 0x2) {
- printk(KERN_ERR
- "wd->sta.wepStatus = ZM_ENCRYPTION_TKIP\n");
+ pr_err("wd->sta.wepStatus = ZM_ENCRYPTION_TKIP\n");
/* wd->sta.wepStatus = ZM_ENCRYPTION_TKIP; */
/* wd->ws.wepStatus = ZM_ENCRYPTION_TKIP; */
zfiWlanSetWepStatus(dev, ZM_ENCRYPTION_TKIP);
} else {
- printk(KERN_ERR
- "wd->sta.wepStatus = ZM_ENCRYPTION_AES\n");
+ pr_err("wd->sta.wepStatus = ZM_ENCRYPTION_AES\n");
/* wd->sta.wepStatus = ZM_ENCRYPTION_AES; */
/* wd->ws.wepStatus = ZM_ENCRYPTION_AES; */
zfiWlanSetWepStatus(dev, ZM_ENCRYPTION_AES);
@@ -2633,7 +2608,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
zfiWlanSetWpaSupport(dev, 1);
} else {
/* Reset the WPA related variables */
- printk(KERN_ERR "disable\n");
+ pr_err("disable\n");
zfiWlanSetWpaSupport(dev, 0);
zfiWlanSetAuthenticationMode(dev, ZM_AUTH_MODE_OPEN);
@@ -2647,46 +2622,45 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
}
if (op == ZD_PARAM_COUNTERMEASURES) {
- printk(KERN_ERR
- "****************ZD_PARAM_COUNTERMEASURES : ");
+ pr_err("****************ZD_PARAM_COUNTERMEASURES : ");
if(arg) {
/* mCounterMeasureState=1; */
- printk(KERN_ERR "enable\n");
+ pr_err("enable\n");
} else {
/* mCounterMeasureState=0; */
- printk(KERN_ERR "disable\n");
+ pr_err("disable\n");
}
}
if (op == ZD_PARAM_DROPUNENCRYPTED) {
- printk(KERN_ERR "ZD_PARAM_DROPUNENCRYPTED : ");
+ pr_err("ZD_PARAM_DROPUNENCRYPTED : ");
if(arg) {
- printk(KERN_ERR "enable\n");
+ pr_err("enable\n");
} else {
- printk(KERN_ERR "disable\n");
+ pr_err("disable\n");
}
}
if (op == ZD_PARAM_AUTH_ALGS) {
- printk(KERN_ERR "ZD_PARAM_AUTH_ALGS : ");
+ pr_err("ZD_PARAM_AUTH_ALGS : ");
if (arg == 0) {
- printk(KERN_ERR "OPEN_SYSTEM\n");
+ pr_err("OPEN_SYSTEM\n");
} else {
- printk(KERN_ERR "SHARED_KEY\n");
+ pr_err("SHARED_KEY\n");
}
}
if (op == ZD_PARAM_WPS_FILTER) {
- printk(KERN_ERR "ZD_PARAM_WPS_FILTER : ");
+ pr_err("ZD_PARAM_WPS_FILTER : ");
if (arg) {
/* mCounterMeasureState=1; */
macp->forwardMgmt = 1;
- printk(KERN_ERR "enable\n");
+ pr_err("enable\n");
} else {
/* mCounterMeasureState=0; */
macp->forwardMgmt = 0;
- printk(KERN_ERR "disable\n");
+ pr_err("disable\n");
}
}
}
@@ -2707,7 +2681,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if (copy_from_user(&req_wpaie, ifr->ifr_data,
sizeof(struct ieee80211req_wpaie))) {
- printk(KERN_ERR "usbdrv : copy_from_user error\n");
+ pr_err("usbdrv : copy_from_user error\n");
return -EFAULT;
}
@@ -2739,7 +2713,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
case ZM_IOCTL_CENC:
if (copy_from_user(&macp->zd_wpa_req, ifr->ifr_data,
sizeof(struct athr_wlan_param))) {
- printk(KERN_ERR "usbdrv : copy_from_user error\n");
+ pr_err("usbdrv : copy_from_user error\n");
return -EFAULT;
}
diff --git a/drivers/staging/otus/usbdrv.c b/drivers/staging/otus/usbdrv.c
index 48aa30a..76b1c23 100644
--- a/drivers/staging/otus/usbdrv.c
+++ b/drivers/staging/otus/usbdrv.c
@@ -445,7 +445,7 @@ int usbdrv_open(struct net_device *dev)
if (macp->netlink_sk == NULL)
{
- printk(KERN_ERR "Can't create NETLINK socket\n");
+ pr_err("Can't create NETLINK socket\n");
}
#endif
@@ -579,7 +579,7 @@ extern void zfHpLedCtrl(struct net_device *dev, u16_t ledId, u8_t mode);
if (macp->netlink_sk != NULL)
{
// sock_release(macp->netlink_sk);
- printk(KERN_ERR "usbdrv close netlink socket\n");
+ pr_err("usbdrv close netlink socket\n");
}
#endif //ZM_ENABLE_CENC
#if (WLAN_HOSTIF == WLAN_PCI)
@@ -933,27 +933,27 @@ int zfLnxAllocAllUrbs(struct usbdrv_private *macp)
if (usb_endpoint_is_bulk_in(endpoint))
{
/* we found a bulk in endpoint */
- printk(KERN_ERR "bulk in: wMaxPacketSize = %x\n", le16_to_cpu(endpoint->wMaxPacketSize));
+ pr_err("bulk in: wMaxPacketSize = %x\n", le16_to_cpu(endpoint->wMaxPacketSize));
}
if (usb_endpoint_is_bulk_out(endpoint))
{
/* we found a bulk out endpoint */
- printk(KERN_ERR "bulk out: wMaxPacketSize = %x\n", le16_to_cpu(endpoint->wMaxPacketSize));
+ pr_err("bulk out: wMaxPacketSize = %x\n", le16_to_cpu(endpoint->wMaxPacketSize));
}
if (usb_endpoint_is_int_in(endpoint))
{
/* we found a interrupt in endpoint */
- printk(KERN_ERR "interrupt in: wMaxPacketSize = %x\n", le16_to_cpu(endpoint->wMaxPacketSize));
- printk(KERN_ERR "interrupt in: int_interval = %d\n", endpoint->bInterval);
+ pr_err("interrupt in: wMaxPacketSize = %x\n", le16_to_cpu(endpoint->wMaxPacketSize));
+ pr_err("interrupt in: int_interval = %d\n", endpoint->bInterval);
}
if (usb_endpoint_is_int_out(endpoint))
{
/* we found a interrupt out endpoint */
- printk(KERN_ERR "interrupt out: wMaxPacketSize = %x\n", le16_to_cpu(endpoint->wMaxPacketSize));
- printk(KERN_ERR "interrupt out: int_interval = %d\n", endpoint->bInterval);
+ pr_err("interrupt out: wMaxPacketSize = %x\n", le16_to_cpu(endpoint->wMaxPacketSize));
+ pr_err("interrupt out: int_interval = %d\n", endpoint->bInterval);
}
}
@@ -1126,13 +1126,13 @@ u8_t zfLnxClearStructs(struct net_device *dev)
TxQCnt = zfLnxCheckTxBufferCnt(dev);
- printk(KERN_ERR "TxQCnt: %d\n", TxQCnt);
+ pr_err("TxQCnt: %d\n", TxQCnt);
for(ii = 0; ii < TxQCnt; ii++)
{
UsbTxQ_t *TxQ = zfLnxGetUsbTxBuffer(dev);
- printk(KERN_ERR "dev_kfree_skb_any\n");
+ pr_err("dev_kfree_skb_any\n");
/* Free buffer */
dev_kfree_skb_any(TxQ->buf);
}
diff --git a/drivers/staging/otus/wrap_ev.c b/drivers/staging/otus/wrap_ev.c
index bcda0b9..3b984da 100644
--- a/drivers/staging/otus/wrap_ev.c
+++ b/drivers/staging/otus/wrap_ev.c
@@ -86,7 +86,7 @@ u16_t zfLnxAsocNotify(zdev_t* dev, u16_t* macAddr, u8_t* body, u16_t bodySize, u
// }
// else
// {
-// printk(KERN_ERR "Can' find a valid VAP device, port: %d\n", port);
+// pr_err("Can' find a valid VAP device, port: %d\n", port);
// }
// }
//}
@@ -194,7 +194,7 @@ void zfLnxConnectNotify(zdev_t* dev, u16_t status, u16_t* bssid)
// }
// else
// {
- // printk(KERN_ERR "Can' find a valid VAP device, port: %d\n", port);
+ // pr_err("Can' find a valid VAP device, port: %d\n", port);
// }
//}
}
diff --git a/drivers/staging/otus/wrap_sec.c b/drivers/staging/otus/wrap_sec.c
index 0f780ba..9d41227 100644
--- a/drivers/staging/otus/wrap_sec.c
+++ b/drivers/staging/otus/wrap_sec.c
@@ -46,7 +46,7 @@ u16_t zfLnxCencAsocNotify(zdev_t* dev, u16_t* macAddr, u8_t* body, u16_t bodySiz
if (macp->netlink_sk == NULL)
{
- printk(KERN_ERR "NETLINK Socket is NULL\n");
+ pr_err("NETLINK Socket is NULL\n");
return -1;
}
@@ -63,15 +63,15 @@ u16_t zfLnxCencAsocNotify(zdev_t* dev, u16_t* macAddr, u8_t* body, u16_t bodySiz
cenc_info.msg_type = ZM_CENC_WAI_REQUEST;
cenc_info.datalen += 6 + 2;
- printk(KERN_ERR "===== zfwCencSendMsg, bodySize: %d =====\n", bodySize);
+ pr_err("===== zfwCencSendMsg, bodySize: %d =====\n", bodySize);
for(ii = 0; ii < bodySize; ii++)
{
- printk(KERN_ERR "%02x ", body[ii]);
+ pr_err("%02x ", body[ii]);
if ((ii & 0xf) == 0xf)
{
- printk(KERN_ERR "\n");
+ pr_err("\n");
}
}
diff --git a/drivers/staging/otus/wrap_usb.c b/drivers/staging/otus/wrap_usb.c
index 70fd410..6f60b6d 100644
--- a/drivers/staging/otus/wrap_usb.c
+++ b/drivers/staging/otus/wrap_usb.c
@@ -109,11 +109,11 @@ u32_t zfwUsbSubmitControl(zdev_t* dev, u8_t req, u16_t value, u16_t index, void
}
#if 0
- printk(KERN_ERR "req = 0x%02x\n", req);
- printk(KERN_ERR "value = 0x%04x\n", value);
- printk(KERN_ERR "index = 0x%04x\n", index);
- printk(KERN_ERR "data = 0x%lx\n", (u32_t) data);
- printk(KERN_ERR "size = %ld\n", size);
+ pr_err("req = 0x%02x\n", req);
+ pr_err("value = 0x%04x\n", value);
+ pr_err("index = 0x%04x\n", index);
+ pr_err("data = 0x%lx\n", (u32_t) data);
+ pr_err("size = %ld\n", size);
#endif
result = usb_control_msg(macp->udev, usb_sndctrlpipe(macp->udev, 0),
diff --git a/drivers/staging/otus/wwrap.c b/drivers/staging/otus/wwrap.c
index 53d2a45..ebc607c 100644
--- a/drivers/staging/otus/wwrap.c
+++ b/drivers/staging/otus/wwrap.c
@@ -66,7 +66,7 @@ u16_t zfLnxGetFreeTxUrb(zdev_t *dev)
}
else
{
- //printk(KERN_ERR "macp->TxUrbCnt: %d\n", macp->TxUrbCnt);
+ //pr_err("macp->TxUrbCnt: %d\n", macp->TxUrbCnt);
idx = 0xffff;
}
@@ -136,8 +136,8 @@ UsbTxQ_t *zfLnxGetUsbTxBuffer(zdev_t *dev)
{
if (macp->TxBufHead != macp->TxBufTail)
{
- printk(KERN_ERR "zfwGetUsbTxBuf UsbTxBufQ inconsistent: TxBufHead: %d, TxBufTail: %d\n",
- macp->TxBufHead, macp->TxBufTail);
+ pr_err("zfwGetUsbTxBuf UsbTxBufQ inconsistent: TxBufHead: %d, TxBufTail: %d\n",
+ macp->TxBufHead, macp->TxBufTail);
}
spin_unlock_irqrestore(&macp->cs_lock, irqFlag);
@@ -183,8 +183,8 @@ u16_t zfLnxPutUsbTxBuffer(zdev_t *dev, u8_t *hdr, u16_t hdrlen,
}
else
{
- printk(KERN_ERR "zfLnxPutUsbTxBuffer UsbTxBufQ inconsistent: TxBufHead: %d, TxBufTail: %d, TxBufCnt: %d\n",
- macp->TxBufHead, macp->TxBufTail, macp->TxBufCnt);
+ pr_err("zfLnxPutUsbTxBuffer UsbTxBufQ inconsistent: TxBufHead: %d, TxBufTail: %d, TxBufCnt: %d\n",
+ macp->TxBufHead, macp->TxBufTail, macp->TxBufCnt);
spin_unlock_irqrestore(&macp->cs_lock, irqFlag);
return 0xffff;
}
@@ -304,17 +304,17 @@ void zfLnxUsbDataIn_callback(urb_t *urb)
&& (urb->status != -ESHUTDOWN))
{
if (urb->status == -EPIPE){
- //printk(KERN_ERR "nonzero read bulk status received: -EPIPE");
+ //pr_err("nonzero read bulk status received: -EPIPE");
status = -1;
}
if (urb->status == -EPROTO){
- //printk(KERN_ERR "nonzero read bulk status received: -EPROTO");
+ //pr_err("nonzero read bulk status received: -EPROTO");
status = -1;
}
}
- //printk(KERN_ERR "urb->status: 0x%08x\n", urb->status);
+ //pr_err("urb->status: 0x%08x\n", urb->status);
/* Dequeue skb buffer */
buf = zfLnxGetUsbRxBuffer(dev);
@@ -331,7 +331,7 @@ void zfLnxUsbDataIn_callback(urb_t *urb)
if (urb->actual_length == 0)
{
- printk(KERN_ERR "Get an URB whose length is zero");
+ pr_err("Get an URB whose length is zero");
status = -1;
}
@@ -463,7 +463,7 @@ void zfLnxUsbDataIn_callback(urb_t *urb)
}
else
{
- printk(KERN_ERR "Can't find tag, pkt_len: 0x%04x, tag: 0x%04x\n", pkt_len, pkt_tag);
+ pr_err("Can't find tag, pkt_len: 0x%04x, tag: 0x%04x\n", pkt_len, pkt_tag);
/* Free buffer */
dev_kfree_skb_any(buf);
@@ -509,7 +509,7 @@ void zfLnxUsbRegOut_callback(urb_t *urb)
{
//dev_t* dev = urb->context;
- //printk(KERN_ERR "zfwUsbRegOut_callback\n");
+ //pr_err("zfwUsbRegOut_callback\n");
}
void zfLnxUsbRegIn_callback(urb_t *urb)
@@ -526,23 +526,23 @@ void zfLnxUsbRegIn_callback(urb_t *urb)
&& (urb->status != -ESHUTDOWN))
{
if (urb->status == -EPIPE){
- //printk(KERN_ERR "nonzero read bulk status received: -EPIPE");
+ //pr_err("nonzero read bulk status received: -EPIPE");
status = -1;
}
if (urb->status == -EPROTO){
- //printk(KERN_ERR "nonzero read bulk status received: -EPROTO");
+ //pr_err("nonzero read bulk status received: -EPROTO");
status = -1;
}
}
- //printk(KERN_ERR "urb->status: 0x%08x\n", urb->status);
+ //pr_err("urb->status: 0x%08x\n", urb->status);
return;
}
if (urb->actual_length == 0)
{
- printk(KERN_ERR "Get an URB whose length is zero");
+ pr_err("Get an URB whose length is zero");
status = -1;
}
@@ -601,8 +601,8 @@ u32_t zfLnxUsbSubmitTxData(zdev_t* dev)
/* If there is no any free Tx Urb */
if (freeTxUrb == 0xffff)
{
- //printk(KERN_ERR "Can't get free Tx Urb\n");
- //printk("CWY - Can't get free Tx Urb\n");
+ //pr_err("Can't get free Tx Urb\n");
+ //printk("CWY - Can't get free Tx Urb\n");
return 0xffff;
}
@@ -702,12 +702,12 @@ u32_t zfLnxUsbSubmitTxData(zdev_t* dev)
/* Dump control setting */
for(i = 0; i < 8; i++)
{
- printk(KERN_ERR "0x%02x ", TxData->hdr[i]);
+ pr_err("0x%02x ", TxData->hdr[i]);
}
- printk(KERN_ERR "\n");
+ pr_err("\n");
- printk(KERN_ERR "ctrLen: %d, hdrLen: %d, snapLen: %d\n", ctrlLen, TxData->hdrlen, TxData->snapLen);
- printk(KERN_ERR "bufLen: %d, tailLen: %d, len: %d\n", TxData->buf->len, TxData->tailLen, len);
+ pr_err("ctrLen: %d, hdrLen: %d, snapLen: %d\n", ctrlLen, TxData->hdrlen, TxData->snapLen);
+ pr_err("bufLen: %d, tailLen: %d, len: %d\n", TxData->buf->len, TxData->tailLen, len);
}
}
#endif
@@ -829,7 +829,7 @@ void zfLnxInitUsbTxQ(zdev_t* dev)
{
struct usbdrv_private *macp = dev->ml_priv;
- printk(KERN_ERR "zfwInitUsbTxQ\n");
+ pr_err("zfwInitUsbTxQ\n");
/* Zero memory for UsbTxBufQ */
memset(macp->UsbTxBufQ, 0, sizeof(UsbTxQ_t) * ZM_MAX_TX_URB_NUM);
@@ -1100,7 +1100,7 @@ void zfLnxSignalThread(zdev_t *dev, int flag)
if (!schedule_work(&macp->kevent))
{
//Fails is Normal
- //printk(KERN_ERR "schedule_task failed, flag = %x\n", flag);
+ //pr_err("schedule_task failed, flag = %x\n", flag);
}
}
diff --git a/drivers/staging/otus/zdusb.c b/drivers/staging/otus/zdusb.c
index 2a6d937..4534f5d 100644
--- a/drivers/staging/otus/zdusb.c
+++ b/drivers/staging/otus/zdusb.c
@@ -85,18 +85,18 @@ static int zfLnxProbe(struct usb_interface *interface,
product_id = dev->descriptor.idProduct;
#ifdef HMAC_DEBUG
- printk(KERN_NOTICE "vendor_id = %04x\n", vendor_id);
- printk(KERN_NOTICE "product_id = %04x\n", product_id);
+ pr_notice("vendor_id = %04x\n", vendor_id);
+ pr_notice("product_id = %04x\n", product_id);
if (dev->speed == USB_SPEED_HIGH)
- printk(KERN_NOTICE "USB 2.0 Host\n");
+ pr_notice("USB 2.0 Host\n");
else
- printk(KERN_NOTICE "USB 1.1 Host\n");
+ pr_notice("USB 1.1 Host\n");
#endif
if (!(macp = kmalloc(sizeof(struct usbdrv_private), GFP_KERNEL)))
{
- printk(KERN_ERR "out of memory allocating device structure\n");
+ pr_err("out of memory allocating device structure\n");
result = -ENOMEM;
goto fail;
}
@@ -108,7 +108,7 @@ static int zfLnxProbe(struct usb_interface *interface,
if (net == NULL)
{
- printk(KERN_ERR "zfLnxProbe: Not able to alloc etherdev struct\n");
+ pr_err("zfLnxProbe: Not able to alloc etherdev struct\n");
result = -ENOMEM;
goto fail1;
}
@@ -176,7 +176,7 @@ static void zfLnxDisconnect(struct usb_interface *interface)
if (!macp)
{
- printk(KERN_ERR "unregistering non-existant device\n");
+ pr_err("unregistering non-existant device\n");
return;
}
@@ -204,7 +204,7 @@ static void zfLnxDisconnect(struct usb_interface *interface)
usb_put_dev(interface_to_usbdev(interface));
- //printk(KERN_ERR "3. zfLnxUnlinkAllUrbs\n");
+ //pr_err("3. zfLnxUnlinkAllUrbs\n");
//zfLnxUnlinkAllUrbs(macp);
/* Free network interface */
@@ -227,7 +227,7 @@ static struct usb_driver zd1221_driver = {
int __init zfLnxIinit(void)
{
- printk(KERN_NOTICE "%s - version %s\n", DRIVER_NAME, VERSIONID);
+ pr_notice("%s - version %s\n", DRIVER_NAME, VERSIONID);
return usb_register(&zd1221_driver);
}
--
1.6.5.rc3.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
