aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r--drivers/net/tulip/de2104x.c2
-rw-r--r--drivers/net/tulip/de4x5.c6
-rw-r--r--drivers/net/tulip/dmfe.c2
-rw-r--r--drivers/net/tulip/uli526x.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index e7609a05032..81f054dbb88 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -612,7 +612,7 @@ static int de_start_xmit (struct sk_buff *skb, struct net_device *dev)
612 if (tx_free == 0) { 612 if (tx_free == 0) {
613 netif_stop_queue(dev); 613 netif_stop_queue(dev);
614 spin_unlock_irq(&de->lock); 614 spin_unlock_irq(&de->lock);
615 return 1; 615 return NETDEV_TX_BUSY;
616 } 616 }
617 tx_free--; 617 tx_free--;
618 618
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 32256179a20..eb72d2e9ab3 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) {
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index f2e669974c7..8e78f003f08 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -686,7 +686,7 @@ static int dmfe_start_xmit(struct sk_buff *skb, struct DEVICE *dev)
686 spin_unlock_irqrestore(&db->lock, flags); 686 spin_unlock_irqrestore(&db->lock, flags);
687 printk(KERN_ERR DRV_NAME ": No Tx resource %ld\n", 687 printk(KERN_ERR DRV_NAME ": No Tx resource %ld\n",
688 db->tx_queue_cnt); 688 db->tx_queue_cnt);
689 return 1; 689 return NETDEV_TX_BUSY;
690 } 690 }
691 691
692 /* Disable NIC interrupt */ 692 /* Disable NIC interrupt */
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 8761a5a5bd7..9277ce8febe 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -591,7 +591,7 @@ static int uli526x_start_xmit(struct sk_buff *skb, struct net_device *dev)
591 if (db->tx_packet_cnt >= TX_FREE_DESC_CNT) { 591 if (db->tx_packet_cnt >= TX_FREE_DESC_CNT) {
592 spin_unlock_irqrestore(&db->lock, flags); 592 spin_unlock_irqrestore(&db->lock, flags);
593 printk(KERN_ERR DRV_NAME ": No Tx resource %ld\n", db->tx_packet_cnt); 593 printk(KERN_ERR DRV_NAME ": No Tx resource %ld\n", db->tx_packet_cnt);
594 return 1; 594 return NETDEV_TX_BUSY;
595 } 595 }
596 596
597 /* Disable NIC interrupt */ 597 /* Disable NIC interrupt */