git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into next
[pandora-kernel.git]
/
drivers
/
staging
/
et131x
/
et131x_netdev.c
diff --git
a/drivers/staging/et131x/et131x_netdev.c
b/drivers/staging/et131x/et131x_netdev.c
index
951c73d
..
59e99cc
100644
(file)
--- a/
drivers/staging/et131x/et131x_netdev.c
+++ b/
drivers/staging/et131x/et131x_netdev.c
@@
-585,11
+585,11
@@
int et131x_tx(struct sk_buff *skb, struct net_device *netdev)
* available
*/
netif_stop_queue(netdev);
* available
*/
netif_stop_queue(netdev);
- status =
1
;
+ status =
NETDEV_TX_BUSY
;
} else {
DBG_WARNING(et131x_dbginfo,
"Misc error; drop packet\n");
} else {
DBG_WARNING(et131x_dbginfo,
"Misc error; drop packet\n");
- status =
0
;
+ status =
NETDEV_TX_OK
;
}
}
}
}