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
fsl_pq_mdio: Fix fsl_pq_mdio to work with modules
[safe/jmp/linux-2.6]
/
drivers
/
net
/
depca.c
diff --git
a/drivers/net/depca.c
b/drivers/net/depca.c
index
9301eb2
..
97ea2d6
100644
(file)
--- a/
drivers/net/depca.c
+++ b/
drivers/net/depca.c
@@
-957,7
+957,7
@@
static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (TX_BUFFS_AVAIL)
netif_start_queue(dev);
} else
if (TX_BUFFS_AVAIL)
netif_start_queue(dev);
} else
- status =
-1
;
+ status =
NETDEV_TX_LOCKED
;
out:
return status;
out:
return status;
@@
-1839,7
+1839,7
@@
static int load_packet(struct net_device *dev, struct sk_buff *skb)
lp->tx_new = (++end) & lp->txRingMask; /* update current pointers */
} else {
lp->tx_new = (++end) & lp->txRingMask; /* update current pointers */
} else {
- status =
-1
;
+ status =
NETDEV_TX_LOCKED
;
}
return status;
}
return status;