git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: prepare usb net drivers for addition of status as a parameter
[safe/jmp/linux-2.6]
/
drivers
/
net
/
usb
/
catc.c
diff --git
a/drivers/net/usb/catc.c
b/drivers/net/usb/catc.c
index
d762123
..
cb7acbb
100644
(file)
--- a/
drivers/net/usb/catc.c
+++ b/
drivers/net/usb/catc.c
@@
-229,14
+229,15
@@
static void catc_rx_done(struct urb *urb)
u8 *pkt_start = urb->transfer_buffer;
struct sk_buff *skb;
int pkt_len, pkt_offset = 0;
u8 *pkt_start = urb->transfer_buffer;
struct sk_buff *skb;
int pkt_len, pkt_offset = 0;
+ int status = urb->status;
if (!catc->is_f5u011) {
clear_bit(RX_RUNNING, &catc->flags);
pkt_offset = 2;
}
if (!catc->is_f5u011) {
clear_bit(RX_RUNNING, &catc->flags);
pkt_offset = 2;
}
- if (
urb->
status) {
- dbg("rx_done, status %d, length %d",
urb->
status, urb->actual_length);
+ if (status) {
+ dbg("rx_done, status %d, length %d", status, urb->actual_length);
return;
}
return;
}
@@
-273,12
+274,12
@@
static void catc_rx_done(struct urb *urb)
if (catc->is_f5u011) {
if (atomic_read(&catc->recq_sz)) {
if (catc->is_f5u011) {
if (atomic_read(&catc->recq_sz)) {
- int stat
us
;
+ int stat
e
;
atomic_dec(&catc->recq_sz);
dbg("getting extra packet");
urb->dev = catc->usbdev;
atomic_dec(&catc->recq_sz);
dbg("getting extra packet");
urb->dev = catc->usbdev;
- if ((stat
us
= usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
- dbg("submit(rx_urb) status %d", stat
us
);
+ if ((stat
e
= usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
+ dbg("submit(rx_urb) status %d", stat
e
);
}
} else {
clear_bit(RX_RUNNING, &catc->flags);
}
} else {
clear_bit(RX_RUNNING, &catc->flags);
@@
-290,8
+291,9
@@
static void catc_irq_done(struct urb *urb)
{
struct catc *catc = urb->context;
u8 *data = urb->transfer_buffer;
{
struct catc *catc = urb->context;
u8 *data = urb->transfer_buffer;
- int status;
+ int status
= urb->status
;
unsigned int hasdata = 0, linksts = LinkNoChange;
unsigned int hasdata = 0, linksts = LinkNoChange;
+ int res;
if (!catc->is_f5u011) {
hasdata = data[1] & 0x80;
if (!catc->is_f5u011) {
hasdata = data[1] & 0x80;
@@
-307,7
+309,7
@@
static void catc_irq_done(struct urb *urb)
linksts = LinkBad;
}
linksts = LinkBad;
}
- switch (
urb->
status) {
+ switch (status) {
case 0: /* success */
break;
case -ECONNRESET: /* unlink */
case 0: /* success */
break;
case -ECONNRESET: /* unlink */
@@
-316,7
+318,7
@@
static void catc_irq_done(struct urb *urb)
return;
/* -EPIPE: should clear the halt */
default: /* error */
return;
/* -EPIPE: should clear the halt */
default: /* error */
- dbg("irq_done, status %d, data %02x %02x.",
urb->
status, data[0], data[1]);
+ dbg("irq_done, status %d, data %02x %02x.", status, data[0], data[1]);
goto resubmit;
}
goto resubmit;
}
@@
-336,17
+338,17
@@
static void catc_irq_done(struct urb *urb)
atomic_inc(&catc->recq_sz);
} else {
catc->rx_urb->dev = catc->usbdev;
atomic_inc(&catc->recq_sz);
} else {
catc->rx_urb->dev = catc->usbdev;
- if ((
statu
s = usb_submit_urb(catc->rx_urb, GFP_ATOMIC)) < 0) {
- err("submit(rx_urb) status %d",
statu
s);
+ if ((
re
s = usb_submit_urb(catc->rx_urb, GFP_ATOMIC)) < 0) {
+ err("submit(rx_urb) status %d",
re
s);
}
}
}
resubmit:
}
}
}
resubmit:
-
statu
s = usb_submit_urb (urb, GFP_ATOMIC);
- if (
statu
s)
+
re
s = usb_submit_urb (urb, GFP_ATOMIC);
+ if (
re
s)
err ("can't resubmit intr, %s-%s, status %d",
catc->usbdev->bus->bus_name,
err ("can't resubmit intr, %s-%s, status %d",
catc->usbdev->bus->bus_name,
- catc->usbdev->devpath,
statu
s);
+ catc->usbdev->devpath,
re
s);
}
/*
}
/*
@@
-378,9
+380,9
@@
static void catc_tx_done(struct urb *urb)
{
struct catc *catc = urb->context;
unsigned long flags;
{
struct catc *catc = urb->context;
unsigned long flags;
- int r;
+ int r
, status = urb->status
;
- if (
urb->
status == -ECONNRESET) {
+ if (status == -ECONNRESET) {
dbg("Tx Reset.");
urb->status = 0;
catc->netdev->trans_start = jiffies;
dbg("Tx Reset.");
urb->status = 0;
catc->netdev->trans_start = jiffies;
@@
-390,8
+392,8
@@
static void catc_tx_done(struct urb *urb)
return;
}
return;
}
- if (
urb->
status) {
- dbg("tx_done, status %d, length %d",
urb->
status, urb->actual_length);
+ if (status) {
+ dbg("tx_done, status %d, length %d", status, urb->actual_length);
return;
}
return;
}
@@
-502,9
+504,10
@@
static void catc_ctrl_done(struct urb *urb)
struct catc *catc = urb->context;
struct ctrl_queue *q;
unsigned long flags;
struct catc *catc = urb->context;
struct ctrl_queue *q;
unsigned long flags;
+ int status = urb->status;
- if (
urb->
status)
- dbg("ctrl_done, status %d, len %d.",
urb->
status, urb->actual_length);
+ if (status)
+ dbg("ctrl_done, status %d, len %d.", status, urb->actual_length);
spin_lock_irqsave(&catc->ctrl_lock, flags);
spin_lock_irqsave(&catc->ctrl_lock, flags);