diff options
Diffstat (limited to 'drivers/net/tulip/de4x5.c')
-rw-r--r-- | drivers/net/tulip/de4x5.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index 32256179a205..eb72d2e9ab3d 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
@@ -1461,12 +1461,12 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev) | |||
1461 | { | 1461 | { |
1462 | struct de4x5_private *lp = netdev_priv(dev); | 1462 | struct de4x5_private *lp = netdev_priv(dev); |
1463 | u_long iobase = dev->base_addr; | 1463 | u_long iobase = dev->base_addr; |
1464 | int status = 0; | 1464 | int status = NETDEV_TX_OK; |
1465 | u_long flags = 0; | 1465 | u_long flags = 0; |
1466 | 1466 | ||
1467 | netif_stop_queue(dev); | 1467 | netif_stop_queue(dev); |
1468 | if (!lp->tx_enable) { /* Cannot send for now */ | 1468 | if (!lp->tx_enable) { /* Cannot send for now */ |
1469 | return -1; | 1469 | return NETDEV_TX_LOCKED; |
1470 | } | 1470 | } |
1471 | 1471 | ||
1472 | /* | 1472 | /* |
@@ -1480,7 +1480,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev) | |||
1480 | 1480 | ||
1481 | /* Test if cache is already locked - requeue skb if so */ | 1481 | /* Test if cache is already locked - requeue skb if so */ |
1482 | if (test_and_set_bit(0, (void *)&lp->cache.lock) && !lp->interrupt) | 1482 | if (test_and_set_bit(0, (void *)&lp->cache.lock) && !lp->interrupt) |
1483 | return -1; | 1483 | return NETDEV_TX_LOCKED; |
1484 | 1484 | ||
1485 | /* Transmit descriptor ring full or stale skb */ | 1485 | /* Transmit descriptor ring full or stale skb */ |
1486 | if (netif_queue_stopped(dev) || (u_long) lp->tx_skb[lp->tx_new] > 1) { | 1486 | if (netif_queue_stopped(dev) || (u_long) lp->tx_skb[lp->tx_new] > 1) { |