Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 141165
b: refs/heads/master
c: 350f2f4
h: refs/heads/master
i:
  141163: 415c00e
v: v3
  • Loading branch information
Moritz Muehlenhoff authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent b1b64ee commit 3c22377
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 33 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2d200d9f63786f7dd18d47e28c7b3eb8d261aae4
refs/heads/master: 350f2f4bd6570f6f1996516ddd135ab2a95484de
10 changes: 5 additions & 5 deletions trunk/drivers/staging/wlan-ng/hfa384x_usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2244,7 +2244,7 @@ hfa384x_drvr_flashdl_write(
return -EINVAL;
}

WLAN_LOG_INFO("Download %d bytes to flash @0x%06x\n", len, daddr);
printk(KERN_INFO "Download %d bytes to flash @0x%06x\n", len, daddr);

/* Convert to flat address for arithmetic */
/* NOTE: dlbuffer RID stores the address in AUX format */
Expand Down Expand Up @@ -2282,7 +2282,7 @@ WLAN_LOG_WARNING("dlbuf@0x%06lx len=%d to=%d\n", dlbufaddr, hw->bufinfo.len, hw-
burnlo = HFA384x_ADDR_CMD_MKOFF(burndaddr);
burnhi = HFA384x_ADDR_CMD_MKPAGE(burndaddr);

WLAN_LOG_INFO("Writing %d bytes to flash @0x%06x\n",
printk(KERN_INFO "Writing %d bytes to flash @0x%06x\n",
burnlen, burndaddr);

/* Set the download mode */
Expand Down Expand Up @@ -2665,7 +2665,7 @@ hfa384x_drvr_ramdl_write(hfa384x_t *hw, u32 daddr, void* buf, u32 len)
return -EINVAL;
}

WLAN_LOG_INFO("Writing %d bytes to ram @0x%06x\n", len, daddr);
printk(KERN_INFO "Writing %d bytes to ram @0x%06x\n", len, daddr);

/* How many dowmem calls? */
nwrites = len / HFA384x_USB_RWMEM_MAXLEN;
Expand Down Expand Up @@ -2802,7 +2802,7 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, unsigned int len)
}
}
if ( pdaok ) {
WLAN_LOG_INFO(
printk(KERN_INFO
"PDA Read from 0x%08x in %s space.\n",
pdaloc[i].cardaddr,
pdaloc[i].auxctl == 0 ? "EXTDS" :
Expand Down Expand Up @@ -4087,7 +4087,7 @@ static void hfa384x_usbout_callback(struct urb *urb)
break;

default:
WLAN_LOG_INFO("unknown urb->status=%d\n", urb->status);
printk(KERN_INFO "unknown urb->status=%d\n", urb->status);
++(wlandev->linux_stats.tx_errors);
break;
} /* switch */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/wlan-ng/p80211wext.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ static int p80211wext_siwmode(netdevice_t *dev,
break;
default:
/* Not set yet. */
WLAN_LOG_INFO("Operation mode: %d not support\n", *mode);
printk(KERN_INFO "Operation mode: %d not support\n", *mode);
return -EOPNOTSUPP;
}

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/wlan-ng/prism2mgmt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)

}

WLAN_LOG_INFO("monitor mode disabled\n");
printk(KERN_INFO "monitor mode disabled\n");
msg->resultcode.data = P80211ENUM_resultcode_success;
result = 0;
goto exit;
Expand Down Expand Up @@ -1301,7 +1301,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
}

if (wlandev->netdev->type == ARPHRD_ETHER) {
WLAN_LOG_INFO("monitor mode enabled\n");
printk(KERN_INFO "monitor mode enabled\n");
}

/* Set the driver state */
Expand Down
44 changes: 22 additions & 22 deletions trunk/drivers/staging/wlan-ng/prism2sta.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->ident_nic.major = hfa384x2host_16(hw->ident_nic.major);
hw->ident_nic.minor = hfa384x2host_16(hw->ident_nic.minor);

WLAN_LOG_INFO( "ident: nic h/w: id=0x%02x %d.%d.%d\n",
printk(KERN_INFO "ident: nic h/w: id=0x%02x %d.%d.%d\n",
hw->ident_nic.id, hw->ident_nic.major,
hw->ident_nic.minor, hw->ident_nic.variant);

Expand All @@ -689,7 +689,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->ident_pri_fw.major = hfa384x2host_16(hw->ident_pri_fw.major);
hw->ident_pri_fw.minor = hfa384x2host_16(hw->ident_pri_fw.minor);

WLAN_LOG_INFO( "ident: pri f/w: id=0x%02x %d.%d.%d\n",
printk(KERN_INFO "ident: pri f/w: id=0x%02x %d.%d.%d\n",
hw->ident_pri_fw.id, hw->ident_pri_fw.major,
hw->ident_pri_fw.minor, hw->ident_pri_fw.variant);

Expand Down Expand Up @@ -718,12 +718,12 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->ident_sta_fw.variant &= ~((u16)(BIT(14) | BIT(15)));

if ( hw->ident_sta_fw.id == 0x1f ) {
WLAN_LOG_INFO(
printk(KERN_INFO
"ident: sta f/w: id=0x%02x %d.%d.%d\n",
hw->ident_sta_fw.id, hw->ident_sta_fw.major,
hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
} else {
WLAN_LOG_INFO(
printk(KERN_INFO
"ident: ap f/w: id=0x%02x %d.%d.%d\n",
hw->ident_sta_fw.id, hw->ident_sta_fw.major,
hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
Expand All @@ -747,7 +747,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_sup_mfi.bottom = hfa384x2host_16(hw->cap_sup_mfi.bottom);
hw->cap_sup_mfi.top = hfa384x2host_16(hw->cap_sup_mfi.top);

WLAN_LOG_INFO(
printk(KERN_INFO
"MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_sup_mfi.role, hw->cap_sup_mfi.id,
hw->cap_sup_mfi.variant, hw->cap_sup_mfi.bottom,
Expand All @@ -769,7 +769,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_sup_cfi.bottom = hfa384x2host_16(hw->cap_sup_cfi.bottom);
hw->cap_sup_cfi.top = hfa384x2host_16(hw->cap_sup_cfi.top);

WLAN_LOG_INFO(
printk(KERN_INFO
"CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_sup_cfi.role, hw->cap_sup_cfi.id,
hw->cap_sup_cfi.variant, hw->cap_sup_cfi.bottom,
Expand All @@ -791,7 +791,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_sup_pri.bottom = hfa384x2host_16(hw->cap_sup_pri.bottom);
hw->cap_sup_pri.top = hfa384x2host_16(hw->cap_sup_pri.top);

WLAN_LOG_INFO(
printk(KERN_INFO
"PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_sup_pri.role, hw->cap_sup_pri.id,
hw->cap_sup_pri.variant, hw->cap_sup_pri.bottom,
Expand All @@ -814,13 +814,13 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_sup_sta.top = hfa384x2host_16(hw->cap_sup_sta.top);

if ( hw->cap_sup_sta.id == 0x04 ) {
WLAN_LOG_INFO(
printk(KERN_INFO
"STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_sup_sta.role, hw->cap_sup_sta.id,
hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom,
hw->cap_sup_sta.top);
} else {
WLAN_LOG_INFO(
printk(KERN_INFO
"AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_sup_sta.role, hw->cap_sup_sta.id,
hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom,
Expand All @@ -843,7 +843,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_act_pri_cfi.bottom = hfa384x2host_16(hw->cap_act_pri_cfi.bottom);
hw->cap_act_pri_cfi.top = hfa384x2host_16(hw->cap_act_pri_cfi.top);

WLAN_LOG_INFO(
printk(KERN_INFO
"PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_act_pri_cfi.role, hw->cap_act_pri_cfi.id,
hw->cap_act_pri_cfi.variant, hw->cap_act_pri_cfi.bottom,
Expand All @@ -865,7 +865,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_act_sta_cfi.bottom = hfa384x2host_16(hw->cap_act_sta_cfi.bottom);
hw->cap_act_sta_cfi.top = hfa384x2host_16(hw->cap_act_sta_cfi.top);

WLAN_LOG_INFO(
printk(KERN_INFO
"STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_act_sta_cfi.role, hw->cap_act_sta_cfi.id,
hw->cap_act_sta_cfi.variant, hw->cap_act_sta_cfi.bottom,
Expand All @@ -887,7 +887,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_act_sta_mfi.bottom = hfa384x2host_16(hw->cap_act_sta_mfi.bottom);
hw->cap_act_sta_mfi.top = hfa384x2host_16(hw->cap_act_sta_mfi.top);

WLAN_LOG_INFO(
printk(KERN_INFO
"STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_act_sta_mfi.role, hw->cap_act_sta_mfi.id,
hw->cap_act_sta_mfi.variant, hw->cap_act_sta_mfi.bottom,
Expand All @@ -899,7 +899,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
if ( !result ) {
wlan_mkprintstr(snum, HFA384x_RID_NICSERIALNUMBER_LEN,
pstr, sizeof(pstr));
WLAN_LOG_INFO("Prism2 card SN: %s\n", pstr);
printk(KERN_INFO "Prism2 card SN: %s\n", pstr);
} else {
WLAN_LOG_ERROR("Failed to retrieve Prism2 Card SN\n");
goto failed;
Expand Down Expand Up @@ -1263,7 +1263,7 @@ void prism2sta_processing_defer(struct work_struct *data)
*/
netif_carrier_off(wlandev->netdev);

WLAN_LOG_INFO("linkstatus=NOTCONNECTED (unhandled)\n");
printk(KERN_INFO "linkstatus=NOTCONNECTED (unhandled)\n");
break;

case HFA384x_LINK_CONNECTED:
Expand All @@ -1288,7 +1288,7 @@ void prism2sta_processing_defer(struct work_struct *data)
if ( wlandev->netdev->type == ARPHRD_ETHER ) {
u16 portstatus;

WLAN_LOG_INFO("linkstatus=CONNECTED\n");
printk(KERN_INFO "linkstatus=CONNECTED\n");

/* For non-usb devices, we can use the sync versions */
/* Collect the BSSID, and set state to allow tx */
Expand Down Expand Up @@ -1351,10 +1351,10 @@ void prism2sta_processing_defer(struct work_struct *data)
hfa384x_drvr_setconfig( hw,
HFA384x_RID_JOINREQUEST,
&joinreq, HFA384x_RID_JOINREQUEST_LEN);
WLAN_LOG_INFO("linkstatus=DISCONNECTED (re-submitting join)\n");
printk(KERN_INFO "linkstatus=DISCONNECTED (re-submitting join)\n");
} else {
if (wlandev->netdev->type == ARPHRD_ETHER)
WLAN_LOG_INFO("linkstatus=DISCONNECTED (unhandled)\n");
printk(KERN_INFO "linkstatus=DISCONNECTED (unhandled)\n");
}
wlandev->macmode = WLAN_MACMODE_NONE;

Expand All @@ -1377,7 +1377,7 @@ void prism2sta_processing_defer(struct work_struct *data)
* Indicate Reassociation
* Enable Transmits, Receives and pass up data frames
*/
WLAN_LOG_INFO("linkstatus=AP_CHANGE\n");
printk(KERN_INFO "linkstatus=AP_CHANGE\n");

result = hfa384x_drvr_getconfig(hw,
HFA384x_RID_CURRENTBSSID,
Expand Down Expand Up @@ -1419,7 +1419,7 @@ void prism2sta_processing_defer(struct work_struct *data)
* Response:
* Block Transmits, Ignore receives of data frames
*/
WLAN_LOG_INFO("linkstatus=AP_OUTOFRANGE (unhandled)\n");
printk(KERN_INFO "linkstatus=AP_OUTOFRANGE (unhandled)\n");

netif_carrier_off(wlandev->netdev);

Expand All @@ -1432,7 +1432,7 @@ void prism2sta_processing_defer(struct work_struct *data)
* Response:
* Enable Transmits, Receives and pass up data frames
*/
WLAN_LOG_INFO("linkstatus=AP_INRANGE\n");
printk(KERN_INFO "linkstatus=AP_INRANGE\n");

hw->link_status = HFA384x_LINK_CONNECTED;
netif_carrier_on(wlandev->netdev);
Expand All @@ -1456,9 +1456,9 @@ void prism2sta_processing_defer(struct work_struct *data)
hfa384x_drvr_setconfig( hw,
HFA384x_RID_JOINREQUEST,
&joinreq, HFA384x_RID_JOINREQUEST_LEN);
WLAN_LOG_INFO("linkstatus=ASSOCFAIL (re-submitting join)\n");
printk(KERN_INFO "linkstatus=ASSOCFAIL (re-submitting join)\n");
} else {
WLAN_LOG_INFO("linkstatus=ASSOCFAIL (unhandled)\n");
printk(KERN_INFO "linkstatus=ASSOCFAIL (unhandled)\n");
}

netif_carrier_off(wlandev->netdev);
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/staging/wlan-ng/wlan_compat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@

#define WLAN_LOG_NOTICE(x,args...) printk(KERN_NOTICE "%s: " x , __func__ , ##args);

#define WLAN_LOG_INFO(args... ) printk(KERN_INFO args)

#if defined(WLAN_INCLUDE_DEBUG)
#define WLAN_HEX_DUMP( l, x, p, n) if( WLAN_DBVAR >= (l) ){ \
int __i__; \
Expand Down

0 comments on commit 3c22377

Please sign in to comment.