projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'dmaengine' into async-tx-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ni65.c
diff --git
a/drivers/net/ni65.c
b/drivers/net/ni65.c
index 6474f02bf78391c758445bd6f24a1f10e3f85fc0..1f10ed603e20bc4ee7943346020b557d3415229a 100644
(file)
--- a/
drivers/net/ni65.c
+++ b/
drivers/net/ni65.c
@@
-1165,7
+1165,7
@@
static int ni65_send_packet(struct sk_buff *skb, struct net_device *dev)
if (test_and_set_bit(0, (void*)&p->lock)) {
printk(KERN_ERR "%s: Queue was locked.\n", dev->name);
- return
1
;
+ return
NETDEV_TX_BUSY
;
}
{