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/tulip_core.c2
-rw-r--r--drivers/net/tulip/uli526x.c4
-rw-r--r--drivers/net/tulip/winbond-840.c2
-rw-r--r--drivers/net/tulip/xircom_cb.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 81f054dbb88d..769af558a345 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -651,7 +651,7 @@ static int de_start_xmit (struct sk_buff *skb, struct net_device *dev)
651 dw32(TxPoll, NormalTxPoll); 651 dw32(TxPoll, NormalTxPoll);
652 dev->trans_start = jiffies; 652 dev->trans_start = jiffies;
653 653
654 return 0; 654 return NETDEV_TX_OK;
655} 655}
656 656
657/* Set or clear the multicast filter for this adaptor. 657/* Set or clear the multicast filter for this adaptor.
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 2abb5d3becc6..9d46638d250e 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -690,7 +690,7 @@ tulip_start_xmit(struct sk_buff *skb, struct net_device *dev)
690 690
691 dev->trans_start = jiffies; 691 dev->trans_start = jiffies;
692 692
693 return 0; 693 return NETDEV_TX_OK;
694} 694}
695 695
696static void tulip_clean_tx_ring(struct tulip_private *tp) 696static void tulip_clean_tx_ring(struct tulip_private *tp)
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 9277ce8febe4..9074a34eb814 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -582,7 +582,7 @@ static int uli526x_start_xmit(struct sk_buff *skb, struct net_device *dev)
582 if (skb->len > MAX_PACKET_SIZE) { 582 if (skb->len > MAX_PACKET_SIZE) {
583 printk(KERN_ERR DRV_NAME ": big packet = %d\n", (u16)skb->len); 583 printk(KERN_ERR DRV_NAME ": big packet = %d\n", (u16)skb->len);
584 dev_kfree_skb(skb); 584 dev_kfree_skb(skb);
585 return 0; 585 return NETDEV_TX_OK;
586 } 586 }
587 587
588 spin_lock_irqsave(&db->lock, flags); 588 spin_lock_irqsave(&db->lock, flags);
@@ -624,7 +624,7 @@ static int uli526x_start_xmit(struct sk_buff *skb, struct net_device *dev)
624 /* free this SKB */ 624 /* free this SKB */
625 dev_kfree_skb(skb); 625 dev_kfree_skb(skb);
626 626
627 return 0; 627 return NETDEV_TX_OK;
628} 628}
629 629
630 630
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 842b1a2c40d4..6bc7540b216e 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1058,7 +1058,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
1058 printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n", 1058 printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n",
1059 dev->name, np->cur_tx, entry); 1059 dev->name, np->cur_tx, entry);
1060 } 1060 }
1061 return 0; 1061 return NETDEV_TX_OK;
1062} 1062}
1063 1063
1064static void netdev_tx_done(struct net_device *dev) 1064static void netdev_tx_done(struct net_device *dev)
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index c2ca9f40e40e..22b6a239fb33 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -434,7 +434,7 @@ static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev)
434 card->transmit_used = nextdescriptor; 434 card->transmit_used = nextdescriptor;
435 leave("xircom-start_xmit - sent"); 435 leave("xircom-start_xmit - sent");
436 spin_unlock_irqrestore(&card->lock,flags); 436 spin_unlock_irqrestore(&card->lock,flags);
437 return 0; 437 return NETDEV_TX_OK;
438 } 438 }
439 439
440 440