diff options
Diffstat (limited to 'drivers/net')
160 files changed, 259 insertions, 259 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index f71b35402755..7bba480d7220 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c | |||
@@ -1101,7 +1101,7 @@ static int elp_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1101 | prime_rx(dev); | 1101 | prime_rx(dev); |
1102 | spin_unlock_irqrestore(&adapter->lock, flags); | 1102 | spin_unlock_irqrestore(&adapter->lock, flags); |
1103 | netif_start_queue(dev); | 1103 | netif_start_queue(dev); |
1104 | return 0; | 1104 | return NETDEV_TX_OK; |
1105 | } | 1105 | } |
1106 | 1106 | ||
1107 | /****************************************************** | 1107 | /****************************************************** |
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c index 96b86659381a..9e93a0b39b6e 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/3c507.c | |||
@@ -537,7 +537,7 @@ static int el16_send_packet (struct sk_buff *skb, struct net_device *dev) | |||
537 | 537 | ||
538 | /* You might need to clean up and record Tx statistics here. */ | 538 | /* You might need to clean up and record Tx statistics here. */ |
539 | 539 | ||
540 | return 0; | 540 | return NETDEV_TX_OK; |
541 | } | 541 | } |
542 | 542 | ||
543 | /* The typical workload of the driver: | 543 | /* The typical workload of the driver: |
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index d2137efbd455..d2515d840c00 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
@@ -892,7 +892,7 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
892 | outb(0x00, ioaddr + TX_STATUS); /* Pop the status stack. */ | 892 | outb(0x00, ioaddr + TX_STATUS); /* Pop the status stack. */ |
893 | } | 893 | } |
894 | } | 894 | } |
895 | return 0; | 895 | return NETDEV_TX_OK; |
896 | } | 896 | } |
897 | 897 | ||
898 | /* The EL3 interrupt handler. */ | 898 | /* The EL3 interrupt handler. */ |
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index 3e00fa8ea65f..85ffd132bada 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c | |||
@@ -1054,7 +1054,7 @@ static int corkscrew_start_xmit(struct sk_buff *skb, | |||
1054 | netif_wake_queue(dev); | 1054 | netif_wake_queue(dev); |
1055 | } | 1055 | } |
1056 | dev->trans_start = jiffies; | 1056 | dev->trans_start = jiffies; |
1057 | return 0; | 1057 | return NETDEV_TX_OK; |
1058 | } | 1058 | } |
1059 | /* Put out the doubleword header... */ | 1059 | /* Put out the doubleword header... */ |
1060 | outl(skb->len, ioaddr + TX_FIFO); | 1060 | outl(skb->len, ioaddr + TX_FIFO); |
@@ -1117,7 +1117,7 @@ static int corkscrew_start_xmit(struct sk_buff *skb, | |||
1117 | outb(0x00, ioaddr + TxStatus); /* Pop the status stack. */ | 1117 | outb(0x00, ioaddr + TxStatus); /* Pop the status stack. */ |
1118 | } | 1118 | } |
1119 | } | 1119 | } |
1120 | return 0; | 1120 | return NETDEV_TX_OK; |
1121 | } | 1121 | } |
1122 | 1122 | ||
1123 | /* The interrupt handler does all of the Rx thread work and cleans up | 1123 | /* The interrupt handler does all of the Rx thread work and cleans up |
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c index cdd955c4014c..70c701b80d99 100644 --- a/drivers/net/3c523.c +++ b/drivers/net/3c523.c | |||
@@ -1198,7 +1198,7 @@ static int elmc_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1198 | netif_wake_queue(dev); | 1198 | netif_wake_queue(dev); |
1199 | dev_kfree_skb(skb); | 1199 | dev_kfree_skb(skb); |
1200 | #endif | 1200 | #endif |
1201 | return 0; | 1201 | return NETDEV_TX_OK; |
1202 | } | 1202 | } |
1203 | 1203 | ||
1204 | /******************************************* | 1204 | /******************************************* |
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c index aaa8a9f405d4..72b9ed7f4641 100644 --- a/drivers/net/3c527.c +++ b/drivers/net/3c527.c | |||
@@ -1035,7 +1035,7 @@ static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1035 | 1035 | ||
1036 | if (skb_padto(skb, ETH_ZLEN)) { | 1036 | if (skb_padto(skb, ETH_ZLEN)) { |
1037 | netif_wake_queue(dev); | 1037 | netif_wake_queue(dev); |
1038 | return 0; | 1038 | return NETDEV_TX_OK; |
1039 | } | 1039 | } |
1040 | 1040 | ||
1041 | atomic_dec(&lp->tx_count); | 1041 | atomic_dec(&lp->tx_count); |
@@ -1066,7 +1066,7 @@ static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1066 | p->control &= ~CONTROL_EOL; | 1066 | p->control &= ~CONTROL_EOL; |
1067 | 1067 | ||
1068 | netif_wake_queue(dev); | 1068 | netif_wake_queue(dev); |
1069 | return 0; | 1069 | return NETDEV_TX_OK; |
1070 | } | 1070 | } |
1071 | 1071 | ||
1072 | 1072 | ||
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index c34aee91250b..202048450eed 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -2083,7 +2083,7 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2083 | iowrite8(0x00, ioaddr + TxStatus); /* Pop the status stack. */ | 2083 | iowrite8(0x00, ioaddr + TxStatus); /* Pop the status stack. */ |
2084 | } | 2084 | } |
2085 | } | 2085 | } |
2086 | return 0; | 2086 | return NETDEV_TX_OK; |
2087 | } | 2087 | } |
2088 | 2088 | ||
2089 | static int | 2089 | static int |
@@ -2173,7 +2173,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2173 | iowrite16(DownUnstall, ioaddr + EL3_CMD); | 2173 | iowrite16(DownUnstall, ioaddr + EL3_CMD); |
2174 | spin_unlock_irqrestore(&vp->lock, flags); | 2174 | spin_unlock_irqrestore(&vp->lock, flags); |
2175 | dev->trans_start = jiffies; | 2175 | dev->trans_start = jiffies; |
2176 | return 0; | 2176 | return NETDEV_TX_OK; |
2177 | } | 2177 | } |
2178 | 2178 | ||
2179 | /* The interrupt handler does all of the Rx thread work and cleans up | 2179 | /* The interrupt handler does all of the Rx thread work and cleans up |
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 50efde11ea6c..07919d0877ee 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
@@ -891,7 +891,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev) | |||
891 | cpw8(TxPoll, NormalTxPoll); | 891 | cpw8(TxPoll, NormalTxPoll); |
892 | dev->trans_start = jiffies; | 892 | dev->trans_start = jiffies; |
893 | 893 | ||
894 | return 0; | 894 | return NETDEV_TX_OK; |
895 | } | 895 | } |
896 | 896 | ||
897 | /* Set or clear the multicast filter for this adaptor. | 897 | /* Set or clear the multicast filter for this adaptor. |
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index 8ae72ec14456..1a223cd1933a 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -1706,7 +1706,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev) | |||
1706 | } else { | 1706 | } else { |
1707 | dev_kfree_skb(skb); | 1707 | dev_kfree_skb(skb); |
1708 | dev->stats.tx_dropped++; | 1708 | dev->stats.tx_dropped++; |
1709 | return 0; | 1709 | return NETDEV_TX_OK; |
1710 | } | 1710 | } |
1711 | 1711 | ||
1712 | spin_lock_irqsave(&tp->lock, flags); | 1712 | spin_lock_irqsave(&tp->lock, flags); |
@@ -1731,7 +1731,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev) | |||
1731 | pr_debug("%s: Queued Tx packet size %u to slot %d.\n", | 1731 | pr_debug("%s: Queued Tx packet size %u to slot %d.\n", |
1732 | dev->name, len, entry); | 1732 | dev->name, len, entry); |
1733 | 1733 | ||
1734 | return 0; | 1734 | return NETDEV_TX_OK; |
1735 | } | 1735 | } |
1736 | 1736 | ||
1737 | 1737 | ||
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index 77547545509b..996cc9102215 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
@@ -1068,7 +1068,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1068 | 1068 | ||
1069 | if (skb->len < ETH_ZLEN) { | 1069 | if (skb->len < ETH_ZLEN) { |
1070 | if (skb_padto(skb, ETH_ZLEN)) | 1070 | if (skb_padto(skb, ETH_ZLEN)) |
1071 | return 0; | 1071 | return NETDEV_TX_OK; |
1072 | length = ETH_ZLEN; | 1072 | length = ETH_ZLEN; |
1073 | } | 1073 | } |
1074 | netif_stop_queue(dev); | 1074 | netif_stop_queue(dev); |
@@ -1110,7 +1110,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1110 | 1110 | ||
1111 | netif_start_queue(dev); | 1111 | netif_start_queue(dev); |
1112 | 1112 | ||
1113 | return 0; | 1113 | return NETDEV_TX_OK; |
1114 | } | 1114 | } |
1115 | 1115 | ||
1116 | static void print_eth(unsigned char *add, char *str) | 1116 | static void print_eth(unsigned char *add, char *str) |
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 19831bd64016..61ac671f97bf 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
@@ -1346,7 +1346,7 @@ static int amd8111e_start_xmit(struct sk_buff *skb, struct net_device * dev) | |||
1346 | netif_stop_queue(dev); | 1346 | netif_stop_queue(dev); |
1347 | } | 1347 | } |
1348 | spin_unlock_irqrestore(&lp->lock, flags); | 1348 | spin_unlock_irqrestore(&lp->lock, flags); |
1349 | return 0; | 1349 | return NETDEV_TX_OK; |
1350 | } | 1350 | } |
1351 | /* | 1351 | /* |
1352 | This function returns all the memory mapped registers of the device. | 1352 | This function returns all the memory mapped registers of the device. |
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 7f8325419803..29b279f88efb 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
@@ -920,7 +920,7 @@ static int cops_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
920 | dev->stats.tx_bytes += skb->len; | 920 | dev->stats.tx_bytes += skb->len; |
921 | dev->trans_start = jiffies; | 921 | dev->trans_start = jiffies; |
922 | dev_kfree_skb (skb); | 922 | dev_kfree_skb (skb); |
923 | return 0; | 923 | return NETDEV_TX_OK; |
924 | } | 924 | } |
925 | 925 | ||
926 | /* | 926 | /* |
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c index 78cea5e80b1d..6cfd961bb8de 100644 --- a/drivers/net/appletalk/ipddp.c +++ b/drivers/net/appletalk/ipddp.c | |||
@@ -132,7 +132,7 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev) | |||
132 | } | 132 | } |
133 | if(rt == NULL) { | 133 | if(rt == NULL) { |
134 | spin_unlock(&ipddp_route_lock); | 134 | spin_unlock(&ipddp_route_lock); |
135 | return 0; | 135 | return NETDEV_TX_OK; |
136 | } | 136 | } |
137 | 137 | ||
138 | our_addr = atalk_find_dev_addr(rt->dev); | 138 | our_addr = atalk_find_dev_addr(rt->dev); |
@@ -181,7 +181,7 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev) | |||
181 | 181 | ||
182 | spin_unlock(&ipddp_route_lock); | 182 | spin_unlock(&ipddp_route_lock); |
183 | 183 | ||
184 | return 0; | 184 | return NETDEV_TX_OK; |
185 | } | 185 | } |
186 | 186 | ||
187 | /* | 187 | /* |
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index b642647170be..c80fb9cf8ffa 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c | |||
@@ -932,7 +932,7 @@ static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev) | |||
932 | dev->stats.tx_bytes += skb->len; | 932 | dev->stats.tx_bytes += skb->len; |
933 | 933 | ||
934 | dev_kfree_skb(skb); | 934 | dev_kfree_skb(skb); |
935 | return 0; | 935 | return NETDEV_TX_OK; |
936 | } | 936 | } |
937 | 937 | ||
938 | /* initialization stuff */ | 938 | /* initialization stuff */ |
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c index 58e8d522e5bc..47d976cc3d7d 100644 --- a/drivers/net/ariadne.c +++ b/drivers/net/ariadne.c | |||
@@ -610,7 +610,7 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
610 | if (skb->len < ETH_ZLEN) | 610 | if (skb->len < ETH_ZLEN) |
611 | { | 611 | { |
612 | if (skb_padto(skb, ETH_ZLEN)) | 612 | if (skb_padto(skb, ETH_ZLEN)) |
613 | return 0; | 613 | return NETDEV_TX_OK; |
614 | len = ETH_ZLEN; | 614 | len = ETH_ZLEN; |
615 | } | 615 | } |
616 | 616 | ||
@@ -685,7 +685,7 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
685 | } | 685 | } |
686 | local_irq_restore(flags); | 686 | local_irq_restore(flags); |
687 | 687 | ||
688 | return 0; | 688 | return NETDEV_TX_OK; |
689 | } | 689 | } |
690 | 690 | ||
691 | 691 | ||
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c index 627bc75da17d..164b37e85eea 100644 --- a/drivers/net/arm/am79c961a.c +++ b/drivers/net/arm/am79c961a.c | |||
@@ -482,7 +482,7 @@ am79c961_sendpacket(struct sk_buff *skb, struct net_device *dev) | |||
482 | 482 | ||
483 | dev_kfree_skb(skb); | 483 | dev_kfree_skb(skb); |
484 | 484 | ||
485 | return 0; | 485 | return NETDEV_TX_OK; |
486 | } | 486 | } |
487 | 487 | ||
488 | /* | 488 | /* |
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c index 2e7419a61191..d46a06e20db0 100644 --- a/drivers/net/arm/at91_ether.c +++ b/drivers/net/arm/at91_ether.c | |||
@@ -834,7 +834,7 @@ static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
834 | we free and return(0) or don't free and return 1 */ | 834 | we free and return(0) or don't free and return 1 */ |
835 | } | 835 | } |
836 | 836 | ||
837 | return 0; | 837 | return NETDEV_TX_OK; |
838 | } | 838 | } |
839 | 839 | ||
840 | /* | 840 | /* |
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c index edf770f639fa..e47c0d962857 100644 --- a/drivers/net/arm/ether1.c +++ b/drivers/net/arm/ether1.c | |||
@@ -748,7 +748,7 @@ ether1_sendpacket (struct sk_buff *skb, struct net_device *dev) | |||
748 | netif_stop_queue(dev); | 748 | netif_stop_queue(dev); |
749 | 749 | ||
750 | out: | 750 | out: |
751 | return 0; | 751 | return NETDEV_TX_OK; |
752 | } | 752 | } |
753 | 753 | ||
754 | static void | 754 | static void |
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c index 455037134aa3..1f7a69c929a6 100644 --- a/drivers/net/arm/ether3.c +++ b/drivers/net/arm/ether3.c | |||
@@ -511,7 +511,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev) | |||
511 | dev_kfree_skb(skb); | 511 | dev_kfree_skb(skb); |
512 | priv(dev)->stats.tx_dropped ++; | 512 | priv(dev)->stats.tx_dropped ++; |
513 | netif_start_queue(dev); | 513 | netif_start_queue(dev); |
514 | return 0; | 514 | return NETDEV_TX_OK; |
515 | } | 515 | } |
516 | 516 | ||
517 | length = (length + 1) & ~1; | 517 | length = (length + 1) & ~1; |
@@ -562,7 +562,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev) | |||
562 | netif_stop_queue(dev); | 562 | netif_stop_queue(dev); |
563 | 563 | ||
564 | out: | 564 | out: |
565 | return 0; | 565 | return NETDEV_TX_OK; |
566 | } | 566 | } |
567 | 567 | ||
568 | static irqreturn_t | 568 | static irqreturn_t |
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 18b566ad4fd1..c2227d79673a 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c | |||
@@ -643,7 +643,7 @@ static int net_send_packet (struct sk_buff *skb, struct net_device *dev) | |||
643 | netif_start_queue (dev); | 643 | netif_start_queue (dev); |
644 | dev_kfree_skb (skb); | 644 | dev_kfree_skb (skb); |
645 | 645 | ||
646 | return 0; | 646 | return NETDEV_TX_OK; |
647 | } | 647 | } |
648 | 648 | ||
649 | /* The typical workload of the driver: | 649 | /* The typical workload of the driver: |
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index 5425ab0c38c0..0c0deceb6938 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c | |||
@@ -796,7 +796,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) | |||
796 | 796 | ||
797 | if (len > skb->len) { | 797 | if (len > skb->len) { |
798 | if (skb_padto(skb, len)) | 798 | if (skb_padto(skb, len)) |
799 | return 0; | 799 | return NETDEV_TX_OK; |
800 | } | 800 | } |
801 | 801 | ||
802 | netif_stop_queue (dev); | 802 | netif_stop_queue (dev); |
@@ -846,7 +846,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) | |||
846 | lp->tx_full = 1; | 846 | lp->tx_full = 1; |
847 | spin_unlock_irqrestore (&lp->devlock, flags); | 847 | spin_unlock_irqrestore (&lp->devlock, flags); |
848 | 848 | ||
849 | return 0; | 849 | return NETDEV_TX_OK; |
850 | } | 850 | } |
851 | 851 | ||
852 | /* The LANCE interrupt handler. */ | 852 | /* The LANCE interrupt handler. */ |
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index 4317b3edb3d7..4beacc9c909f 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
@@ -587,7 +587,7 @@ static int atp_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
587 | 587 | ||
588 | dev->trans_start = jiffies; | 588 | dev->trans_start = jiffies; |
589 | dev_kfree_skb (skb); | 589 | dev_kfree_skb (skb); |
590 | return 0; | 590 | return NETDEV_TX_OK; |
591 | } | 591 | } |
592 | 592 | ||
593 | 593 | ||
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index d3c734f4d679..2aab1ebc6cd1 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c | |||
@@ -988,7 +988,7 @@ static int au1000_tx(struct sk_buff *skb, struct net_device *dev) | |||
988 | dev_kfree_skb(skb); | 988 | dev_kfree_skb(skb); |
989 | aup->tx_head = (aup->tx_head + 1) & (NUM_TX_DMA - 1); | 989 | aup->tx_head = (aup->tx_head + 1) & (NUM_TX_DMA - 1); |
990 | dev->trans_start = jiffies; | 990 | dev->trans_start = jiffies; |
991 | return 0; | 991 | return NETDEV_TX_OK; |
992 | } | 992 | } |
993 | 993 | ||
994 | /* | 994 | /* |
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index c15fc281f79f..f580b21eabd1 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c | |||
@@ -656,7 +656,7 @@ out: | |||
656 | dev->trans_start = jiffies; | 656 | dev->trans_start = jiffies; |
657 | dev->stats.tx_packets++; | 657 | dev->stats.tx_packets++; |
658 | dev->stats.tx_bytes += (skb->len); | 658 | dev->stats.tx_bytes += (skb->len); |
659 | return 0; | 659 | return NETDEV_TX_OK; |
660 | } | 660 | } |
661 | 661 | ||
662 | static void bfin_mac_rx(struct net_device *dev) | 662 | static void bfin_mac_rx(struct net_device *dev) |
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index 9578a3dfac01..41600011cfd0 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c | |||
@@ -1488,7 +1488,7 @@ bmac_output(struct sk_buff *skb, struct net_device *dev) | |||
1488 | struct bmac_data *bp = netdev_priv(dev); | 1488 | struct bmac_data *bp = netdev_priv(dev); |
1489 | skb_queue_tail(bp->queue, skb); | 1489 | skb_queue_tail(bp->queue, skb); |
1490 | bmac_start(dev); | 1490 | bmac_start(dev); |
1491 | return 0; | 1491 | return NETDEV_TX_OK; |
1492 | } | 1492 | } |
1493 | 1493 | ||
1494 | static void bmac_tx_timeout(unsigned long data) | 1494 | static void bmac_tx_timeout(unsigned long data) |
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index 571f133a8fec..1c30dbec1954 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c | |||
@@ -283,7 +283,7 @@ static int sja1000_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
283 | 283 | ||
284 | priv->write_reg(priv, REG_CMR, CMD_TR); | 284 | priv->write_reg(priv, REG_CMR, CMD_TR); |
285 | 285 | ||
286 | return 0; | 286 | return NETDEV_TX_OK; |
287 | } | 287 | } |
288 | 288 | ||
289 | static void sja1000_rx(struct net_device *dev) | 289 | static void sja1000_rx(struct net_device *dev) |
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index eb066673c2a0..299a33b914f8 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c | |||
@@ -2928,7 +2928,7 @@ static int cas_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2928 | static int ring; | 2928 | static int ring; |
2929 | 2929 | ||
2930 | if (skb_padto(skb, cp->min_frame_size)) | 2930 | if (skb_padto(skb, cp->min_frame_size)) |
2931 | return 0; | 2931 | return NETDEV_TX_OK; |
2932 | 2932 | ||
2933 | /* XXX: we need some higher-level QoS hooks to steer packets to | 2933 | /* XXX: we need some higher-level QoS hooks to steer packets to |
2934 | * individual queues. | 2934 | * individual queues. |
@@ -2936,7 +2936,7 @@ static int cas_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2936 | if (cas_xmit_tx_ringN(cp, ring++ & N_TX_RINGS_MASK, skb)) | 2936 | if (cas_xmit_tx_ringN(cp, ring++ & N_TX_RINGS_MASK, skb)) |
2937 | return NETDEV_TX_BUSY; | 2937 | return NETDEV_TX_BUSY; |
2938 | dev->trans_start = jiffies; | 2938 | dev->trans_start = jiffies; |
2939 | return 0; | 2939 | return NETDEV_TX_OK; |
2940 | } | 2940 | } |
2941 | 2941 | ||
2942 | static void cas_init_tx_dma(struct cas *cp) | 2942 | static void cas_init_tx_dma(struct cas *cp) |
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index 7a18dc7e5c7f..15c0195ebd31 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c | |||
@@ -1108,7 +1108,7 @@ e100_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1108 | 1108 | ||
1109 | spin_unlock_irqrestore(&np->lock, flags); | 1109 | spin_unlock_irqrestore(&np->lock, flags); |
1110 | 1110 | ||
1111 | return 0; | 1111 | return NETDEV_TX_OK; |
1112 | } | 1112 | } |
1113 | 1113 | ||
1114 | /* | 1114 | /* |
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 3eee666a9cd2..b5f553a4aa48 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
@@ -1571,7 +1571,7 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1571 | * to restart the netdevice layer | 1571 | * to restart the netdevice layer |
1572 | */ | 1572 | */ |
1573 | 1573 | ||
1574 | return 0; | 1574 | return NETDEV_TX_OK; |
1575 | } | 1575 | } |
1576 | 1576 | ||
1577 | /* The typical workload of the driver: | 1577 | /* The typical workload of the driver: |
diff --git a/drivers/net/de600.c b/drivers/net/de600.c index e1af089064bc..6b13f4fd2e96 100644 --- a/drivers/net/de600.c +++ b/drivers/net/de600.c | |||
@@ -226,7 +226,7 @@ static int de600_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
226 | } | 226 | } |
227 | spin_unlock_irqrestore(&de600_lock, flags); | 227 | spin_unlock_irqrestore(&de600_lock, flags); |
228 | dev_kfree_skb(skb); | 228 | dev_kfree_skb(skb); |
229 | return 0; | 229 | return NETDEV_TX_OK; |
230 | } | 230 | } |
231 | 231 | ||
232 | /* | 232 | /* |
diff --git a/drivers/net/de620.c b/drivers/net/de620.c index 55d2bb67cffa..45794f6cb0f6 100644 --- a/drivers/net/de620.c +++ b/drivers/net/de620.c | |||
@@ -542,7 +542,7 @@ static int de620_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
542 | dev->stats.tx_packets++; | 542 | dev->stats.tx_packets++; |
543 | spin_unlock_irqrestore(&de620_lock, flags); | 543 | spin_unlock_irqrestore(&de620_lock, flags); |
544 | dev_kfree_skb (skb); | 544 | dev_kfree_skb (skb); |
545 | return 0; | 545 | return NETDEV_TX_OK; |
546 | } | 546 | } |
547 | 547 | ||
548 | /***************************************************** | 548 | /***************************************************** |
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 2b22e580c4de..a31696a3928e 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
@@ -902,7 +902,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
902 | 902 | ||
903 | if (len < ETH_ZLEN) { | 903 | if (len < ETH_ZLEN) { |
904 | if (skb_padto(skb, ETH_ZLEN)) | 904 | if (skb_padto(skb, ETH_ZLEN)) |
905 | return 0; | 905 | return NETDEV_TX_OK; |
906 | len = ETH_ZLEN; | 906 | len = ETH_ZLEN; |
907 | } | 907 | } |
908 | 908 | ||
@@ -933,7 +933,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
933 | dev->trans_start = jiffies; | 933 | dev->trans_start = jiffies; |
934 | dev_kfree_skb(skb); | 934 | dev_kfree_skb(skb); |
935 | 935 | ||
936 | return 0; | 936 | return NETDEV_TX_OK; |
937 | } | 937 | } |
938 | 938 | ||
939 | static void lance_load_multicast(struct net_device *dev) | 939 | static void lance_load_multicast(struct net_device *dev) |
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index dd771dea6ae6..ffd9edceb317 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c | |||
@@ -788,7 +788,7 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
788 | /* free this SKB */ | 788 | /* free this SKB */ |
789 | dev_kfree_skb(skb); | 789 | dev_kfree_skb(skb); |
790 | 790 | ||
791 | return 0; | 791 | return NETDEV_TX_OK; |
792 | } | 792 | } |
793 | 793 | ||
794 | /* | 794 | /* |
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c index 33fa9eee4cac..2818d5de3940 100644 --- a/drivers/net/dnet.c +++ b/drivers/net/dnet.c | |||
@@ -596,7 +596,7 @@ static int dnet_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
596 | 596 | ||
597 | dev->trans_start = jiffies; | 597 | dev->trans_start = jiffies; |
598 | 598 | ||
599 | return 0; | 599 | return NETDEV_TX_OK; |
600 | } | 600 | } |
601 | 601 | ||
602 | static void dnet_reset_hw(struct dnet *bp) | 602 | static void dnet_reset_hw(struct dnet *bp) |
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c index 8ebd7d789405..713ce6c532c5 100644 --- a/drivers/net/dummy.c +++ b/drivers/net/dummy.c | |||
@@ -85,7 +85,7 @@ static int dummy_xmit(struct sk_buff *skb, struct net_device *dev) | |||
85 | dev->stats.tx_bytes += skb->len; | 85 | dev->stats.tx_bytes += skb->len; |
86 | 86 | ||
87 | dev_kfree_skb(skb); | 87 | dev_kfree_skb(skb); |
88 | return 0; | 88 | return NETDEV_TX_OK; |
89 | } | 89 | } |
90 | 90 | ||
91 | static int dummy_validate(struct nlattr *tb[], struct nlattr *data[]) | 91 | static int dummy_validate(struct nlattr *tb[], struct nlattr *data[]) |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index efa680f4b8dd..a150d58ec60d 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -1720,7 +1720,7 @@ static int e100_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
1720 | } | 1720 | } |
1721 | 1721 | ||
1722 | netdev->trans_start = jiffies; | 1722 | netdev->trans_start = jiffies; |
1723 | return 0; | 1723 | return NETDEV_TX_OK; |
1724 | } | 1724 | } |
1725 | 1725 | ||
1726 | static int e100_tx_clean(struct nic *nic) | 1726 | static int e100_tx_clean(struct nic *nic) |
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index cc2ab6412c73..71605d63708c 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
@@ -1145,7 +1145,7 @@ static int eepro_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1145 | 1145 | ||
1146 | if (length < ETH_ZLEN) { | 1146 | if (length < ETH_ZLEN) { |
1147 | if (skb_padto(skb, ETH_ZLEN)) | 1147 | if (skb_padto(skb, ETH_ZLEN)) |
1148 | return 0; | 1148 | return NETDEV_TX_OK; |
1149 | length = ETH_ZLEN; | 1149 | length = ETH_ZLEN; |
1150 | } | 1150 | } |
1151 | netif_stop_queue (dev); | 1151 | netif_stop_queue (dev); |
@@ -1178,7 +1178,7 @@ static int eepro_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1178 | eepro_en_int(ioaddr); | 1178 | eepro_en_int(ioaddr); |
1179 | spin_unlock_irqrestore(&lp->lock, flags); | 1179 | spin_unlock_irqrestore(&lp->lock, flags); |
1180 | 1180 | ||
1181 | return 0; | 1181 | return NETDEV_TX_OK; |
1182 | } | 1182 | } |
1183 | 1183 | ||
1184 | 1184 | ||
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 1686dca28748..8c44ef4ba357 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c | |||
@@ -664,7 +664,7 @@ static int eexp_xmit(struct sk_buff *buf, struct net_device *dev) | |||
664 | 664 | ||
665 | if (buf->len < ETH_ZLEN) { | 665 | if (buf->len < ETH_ZLEN) { |
666 | if (skb_padto(buf, ETH_ZLEN)) | 666 | if (skb_padto(buf, ETH_ZLEN)) |
667 | return 0; | 667 | return NETDEV_TX_OK; |
668 | length = ETH_ZLEN; | 668 | length = ETH_ZLEN; |
669 | } | 669 | } |
670 | 670 | ||
@@ -691,7 +691,7 @@ static int eexp_xmit(struct sk_buff *buf, struct net_device *dev) | |||
691 | spin_unlock_irqrestore(&lp->lock, flags); | 691 | spin_unlock_irqrestore(&lp->lock, flags); |
692 | #endif | 692 | #endif |
693 | enable_irq(dev->irq); | 693 | enable_irq(dev->irq); |
694 | return 0; | 694 | return NETDEV_TX_OK; |
695 | } | 695 | } |
696 | 696 | ||
697 | /* | 697 | /* |
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index fc6cc038c7b8..372d6c6a4e7f 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c | |||
@@ -1299,7 +1299,7 @@ static int enc28j60_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1299 | priv->tx_skb = skb; | 1299 | priv->tx_skb = skb; |
1300 | schedule_work(&priv->tx_work); | 1300 | schedule_work(&priv->tx_work); |
1301 | 1301 | ||
1302 | return 0; | 1302 | return NETDEV_TX_OK; |
1303 | } | 1303 | } |
1304 | 1304 | ||
1305 | static void enc28j60_tx_work_handler(struct work_struct *work) | 1305 | static void enc28j60_tx_work_handler(struct work_struct *work) |
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index b60e27dfcfa7..d6a7aa3142f9 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
@@ -970,7 +970,7 @@ static int epic_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
970 | unsigned long flags; | 970 | unsigned long flags; |
971 | 971 | ||
972 | if (skb_padto(skb, ETH_ZLEN)) | 972 | if (skb_padto(skb, ETH_ZLEN)) |
973 | return 0; | 973 | return NETDEV_TX_OK; |
974 | 974 | ||
975 | /* Caution: the write order is important here, set the field with the | 975 | /* Caution: the write order is important here, set the field with the |
976 | "ownership" bit last. */ | 976 | "ownership" bit last. */ |
@@ -1014,7 +1014,7 @@ static int epic_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1014 | dev->name, (int)skb->len, entry, ctrl_word, | 1014 | dev->name, (int)skb->len, entry, ctrl_word, |
1015 | (int)inl(dev->base_addr + TxSTAT)); | 1015 | (int)inl(dev->base_addr + TxSTAT)); |
1016 | 1016 | ||
1017 | return 0; | 1017 | return NETDEV_TX_OK; |
1018 | } | 1018 | } |
1019 | 1019 | ||
1020 | static void epic_tx_error(struct net_device *dev, struct epic_private *ep, | 1020 | static void epic_tx_error(struct net_device *dev, struct epic_private *ep, |
diff --git a/drivers/net/eql.c b/drivers/net/eql.c index 19b7dd983944..c0e69c5cae84 100644 --- a/drivers/net/eql.c +++ b/drivers/net/eql.c | |||
@@ -348,7 +348,7 @@ static int eql_slave_xmit(struct sk_buff *skb, struct net_device *dev) | |||
348 | 348 | ||
349 | spin_unlock(&eql->queue.lock); | 349 | spin_unlock(&eql->queue.lock); |
350 | 350 | ||
351 | return 0; | 351 | return NETDEV_TX_OK; |
352 | } | 352 | } |
353 | 353 | ||
354 | /* | 354 | /* |
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c index 0d8b6da046f2..97d5205edc8f 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c | |||
@@ -1064,7 +1064,7 @@ static int eth16i_tx(struct sk_buff *skb, struct net_device *dev) | |||
1064 | 1064 | ||
1065 | if (length < ETH_ZLEN) { | 1065 | if (length < ETH_ZLEN) { |
1066 | if (skb_padto(skb, ETH_ZLEN)) | 1066 | if (skb_padto(skb, ETH_ZLEN)) |
1067 | return 0; | 1067 | return NETDEV_TX_OK; |
1068 | length = ETH_ZLEN; | 1068 | length = ETH_ZLEN; |
1069 | } | 1069 | } |
1070 | buf = skb->data; | 1070 | buf = skb->data; |
@@ -1126,7 +1126,7 @@ static int eth16i_tx(struct sk_buff *skb, struct net_device *dev) | |||
1126 | /* outb(TX_INTR_DONE | TX_INTR_16_COL, ioaddr + TX_INTR_REG); */ | 1126 | /* outb(TX_INTR_DONE | TX_INTR_16_COL, ioaddr + TX_INTR_REG); */ |
1127 | status = 0; | 1127 | status = 0; |
1128 | dev_kfree_skb(skb); | 1128 | dev_kfree_skb(skb); |
1129 | return 0; | 1129 | return NETDEV_TX_OK; |
1130 | } | 1130 | } |
1131 | 1131 | ||
1132 | static void eth16i_rx(struct net_device *dev) | 1132 | static void eth16i_rx(struct net_device *dev) |
diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c index 1e9723281405..9c51bc813ad3 100644 --- a/drivers/net/ewrk3.c +++ b/drivers/net/ewrk3.c | |||
@@ -868,7 +868,7 @@ static int ewrk3_queue_pkt (struct sk_buff *skb, struct net_device *dev) | |||
868 | if (inb (EWRK3_FMQC) == 0) | 868 | if (inb (EWRK3_FMQC) == 0) |
869 | netif_stop_queue (dev); | 869 | netif_stop_queue (dev); |
870 | 870 | ||
871 | return 0; | 871 | return NETDEV_TX_OK; |
872 | 872 | ||
873 | err_out: | 873 | err_out: |
874 | ENABLE_IRQs; | 874 | ENABLE_IRQs; |
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index 891be28a7d4f..75e5fe5153d9 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c | |||
@@ -1374,7 +1374,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev) | |||
1374 | dev->trans_start = jiffies; | 1374 | dev->trans_start = jiffies; |
1375 | 1375 | ||
1376 | spin_unlock_irqrestore(&np->lock, flags); | 1376 | spin_unlock_irqrestore(&np->lock, flags); |
1377 | return 0; | 1377 | return NETDEV_TX_OK; |
1378 | } | 1378 | } |
1379 | 1379 | ||
1380 | 1380 | ||
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 0f19b743749b..08f1edb83f27 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
@@ -366,7 +366,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
366 | 366 | ||
367 | spin_unlock_irqrestore(&fep->hw_lock, flags); | 367 | spin_unlock_irqrestore(&fep->hw_lock, flags); |
368 | 368 | ||
369 | return 0; | 369 | return NETDEV_TX_OK; |
370 | } | 370 | } |
371 | 371 | ||
372 | static void | 372 | static void |
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 9d5b62cb30f7..4e8d3728e820 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c | |||
@@ -1369,7 +1369,7 @@ static int hamachi_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1369 | printk(KERN_DEBUG "%s: Hamachi transmit frame #%d queued in slot %d.\n", | 1369 | printk(KERN_DEBUG "%s: Hamachi transmit frame #%d queued in slot %d.\n", |
1370 | dev->name, hmp->cur_tx, entry); | 1370 | dev->name, hmp->cur_tx, entry); |
1371 | } | 1371 | } |
1372 | return 0; | 1372 | return NETDEV_TX_OK; |
1373 | } | 1373 | } |
1374 | 1374 | ||
1375 | /* The interrupt handler does all of the Rx thread work and cleans up | 1375 | /* The interrupt handler does all of the Rx thread work and cleans up |
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 155160052c8b..e88209fc2a2b 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c | |||
@@ -255,7 +255,7 @@ static int sp_xmit(struct sk_buff *skb, struct net_device *dev) | |||
255 | 255 | ||
256 | dev_kfree_skb(skb); | 256 | dev_kfree_skb(skb); |
257 | 257 | ||
258 | return 0; | 258 | return NETDEV_TX_OK; |
259 | } | 259 | } |
260 | 260 | ||
261 | static int sp_open_dev(struct net_device *dev) | 261 | static int sp_open_dev(struct net_device *dev) |
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 5e4b7afd0683..e229edf3261a 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c | |||
@@ -774,18 +774,18 @@ static int baycom_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
774 | if (skb->data[0] != 0) { | 774 | if (skb->data[0] != 0) { |
775 | do_kiss_params(bc, skb->data, skb->len); | 775 | do_kiss_params(bc, skb->data, skb->len); |
776 | dev_kfree_skb(skb); | 776 | dev_kfree_skb(skb); |
777 | return 0; | 777 | return NETDEV_TX_OK; |
778 | } | 778 | } |
779 | if (bc->skb) | 779 | if (bc->skb) |
780 | return NETDEV_TX_LOCKED; | 780 | return NETDEV_TX_LOCKED; |
781 | /* strip KISS byte */ | 781 | /* strip KISS byte */ |
782 | if (skb->len >= HDLCDRV_MAXFLEN+1 || skb->len < 3) { | 782 | if (skb->len >= HDLCDRV_MAXFLEN+1 || skb->len < 3) { |
783 | dev_kfree_skb(skb); | 783 | dev_kfree_skb(skb); |
784 | return 0; | 784 | return NETDEV_TX_OK; |
785 | } | 785 | } |
786 | netif_stop_queue(dev); | 786 | netif_stop_queue(dev); |
787 | bc->skb = skb; | 787 | bc->skb = skb; |
788 | return 0; | 788 | return NETDEV_TX_OK; |
789 | } | 789 | } |
790 | 790 | ||
791 | /* --------------------------------------------------------------------- */ | 791 | /* --------------------------------------------------------------------- */ |
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index abcd19a8bff9..4c5f4dfbe05e 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c | |||
@@ -305,7 +305,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev) | |||
305 | 305 | ||
306 | dev_queue_xmit(skb); | 306 | dev_queue_xmit(skb); |
307 | netif_wake_queue(dev); | 307 | netif_wake_queue(dev); |
308 | return 0; | 308 | return NETDEV_TX_OK; |
309 | } | 309 | } |
310 | 310 | ||
311 | /* | 311 | /* |
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c index 7459b3ac77a9..950f3bb21f9d 100644 --- a/drivers/net/hamradio/dmascc.c +++ b/drivers/net/hamradio/dmascc.c | |||
@@ -959,7 +959,7 @@ static int scc_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
959 | spin_unlock_irqrestore(&priv->ring_lock, flags); | 959 | spin_unlock_irqrestore(&priv->ring_lock, flags); |
960 | dev_kfree_skb(skb); | 960 | dev_kfree_skb(skb); |
961 | 961 | ||
962 | return 0; | 962 | return NETDEV_TX_OK; |
963 | } | 963 | } |
964 | 964 | ||
965 | 965 | ||
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index d034f8ca63cb..16b060b92117 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c | |||
@@ -406,13 +406,13 @@ static int hdlcdrv_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
406 | if (skb->data[0] != 0) { | 406 | if (skb->data[0] != 0) { |
407 | do_kiss_params(sm, skb->data, skb->len); | 407 | do_kiss_params(sm, skb->data, skb->len); |
408 | dev_kfree_skb(skb); | 408 | dev_kfree_skb(skb); |
409 | return 0; | 409 | return NETDEV_TX_OK; |
410 | } | 410 | } |
411 | if (sm->skb) | 411 | if (sm->skb) |
412 | return NETDEV_TX_LOCKED; | 412 | return NETDEV_TX_LOCKED; |
413 | netif_stop_queue(dev); | 413 | netif_stop_queue(dev); |
414 | sm->skb = skb; | 414 | sm->skb = skb; |
415 | return 0; | 415 | return NETDEV_TX_OK; |
416 | } | 416 | } |
417 | 417 | ||
418 | /* --------------------------------------------------------------------- */ | 418 | /* --------------------------------------------------------------------- */ |
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index fda2fc83e9a1..ac191ef2119b 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c | |||
@@ -560,7 +560,7 @@ static int ax_xmit(struct sk_buff *skb, struct net_device *dev) | |||
560 | kfree_skb(skb); | 560 | kfree_skb(skb); |
561 | } | 561 | } |
562 | 562 | ||
563 | return 0; | 563 | return NETDEV_TX_OK; |
564 | } | 564 | } |
565 | 565 | ||
566 | static int ax_open_dev(struct net_device *dev) | 566 | static int ax_open_dev(struct net_device *dev) |
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index d712e7af780c..c5406525c1ad 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
@@ -1643,7 +1643,7 @@ static int scc_net_tx(struct sk_buff *skb, struct net_device *dev) | |||
1643 | if (skb->len > scc->stat.bufsize || skb->len < 2) { | 1643 | if (skb->len > scc->stat.bufsize || skb->len < 2) { |
1644 | scc->dev_stat.tx_dropped++; /* bogus frame */ | 1644 | scc->dev_stat.tx_dropped++; /* bogus frame */ |
1645 | dev_kfree_skb(skb); | 1645 | dev_kfree_skb(skb); |
1646 | return 0; | 1646 | return NETDEV_TX_OK; |
1647 | } | 1647 | } |
1648 | 1648 | ||
1649 | scc->dev_stat.tx_packets++; | 1649 | scc->dev_stat.tx_packets++; |
@@ -1656,7 +1656,7 @@ static int scc_net_tx(struct sk_buff *skb, struct net_device *dev) | |||
1656 | if (kisscmd) { | 1656 | if (kisscmd) { |
1657 | scc_set_param(scc, kisscmd, *skb->data); | 1657 | scc_set_param(scc, kisscmd, *skb->data); |
1658 | dev_kfree_skb(skb); | 1658 | dev_kfree_skb(skb); |
1659 | return 0; | 1659 | return NETDEV_TX_OK; |
1660 | } | 1660 | } |
1661 | 1661 | ||
1662 | spin_lock_irqsave(&scc->lock, flags); | 1662 | spin_lock_irqsave(&scc->lock, flags); |
@@ -1684,7 +1684,7 @@ static int scc_net_tx(struct sk_buff *skb, struct net_device *dev) | |||
1684 | __scc_start_tx_timer(scc, t_dwait, 0); | 1684 | __scc_start_tx_timer(scc, t_dwait, 0); |
1685 | } | 1685 | } |
1686 | spin_unlock_irqrestore(&scc->lock, flags); | 1686 | spin_unlock_irqrestore(&scc->lock, flags); |
1687 | return 0; | 1687 | return NETDEV_TX_OK; |
1688 | } | 1688 | } |
1689 | 1689 | ||
1690 | /* ----> ioctl functions <---- */ | 1690 | /* ----> ioctl functions <---- */ |
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index b06691937ce9..b85aa162314e 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
@@ -600,7 +600,7 @@ static int yam_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
600 | 600 | ||
601 | skb_queue_tail(&yp->send_queue, skb); | 601 | skb_queue_tail(&yp->send_queue, skb); |
602 | dev->trans_start = jiffies; | 602 | dev->trans_start = jiffies; |
603 | return 0; | 603 | return NETDEV_TX_OK; |
604 | } | 604 | } |
605 | 605 | ||
606 | static void yam_start_tx(struct net_device *dev, struct yam_port *yp) | 606 | static void yam_start_tx(struct net_device *dev, struct yam_port *yp) |
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index 1d3429a415e6..d1b63387e9bc 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c | |||
@@ -1499,7 +1499,7 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev) | |||
1499 | goto drop; | 1499 | goto drop; |
1500 | 1500 | ||
1501 | if (lp->chip == HP100_CHIPID_SHASTA && skb_padto(skb, ETH_ZLEN)) | 1501 | if (lp->chip == HP100_CHIPID_SHASTA && skb_padto(skb, ETH_ZLEN)) |
1502 | return 0; | 1502 | return NETDEV_TX_OK; |
1503 | 1503 | ||
1504 | /* Get Tx ring tail pointer */ | 1504 | /* Get Tx ring tail pointer */ |
1505 | if (lp->txrtail->next == lp->txrhead) { | 1505 | if (lp->txrtail->next == lp->txrhead) { |
@@ -1585,7 +1585,7 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev) | |||
1585 | lp->stats.tx_bytes += skb->len; | 1585 | lp->stats.tx_bytes += skb->len; |
1586 | dev->trans_start = jiffies; | 1586 | dev->trans_start = jiffies; |
1587 | 1587 | ||
1588 | return 0; | 1588 | return NETDEV_TX_OK; |
1589 | 1589 | ||
1590 | drop: | 1590 | drop: |
1591 | dev_kfree_skb(skb); | 1591 | dev_kfree_skb(skb); |
@@ -1752,7 +1752,7 @@ static int hp100_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1752 | printk("hp100: %s: start_xmit: end\n", dev->name); | 1752 | printk("hp100: %s: start_xmit: end\n", dev->name); |
1753 | #endif | 1753 | #endif |
1754 | 1754 | ||
1755 | return 0; | 1755 | return NETDEV_TX_OK; |
1756 | 1756 | ||
1757 | drop: | 1757 | drop: |
1758 | dev_kfree_skb(skb); | 1758 | dev_kfree_skb(skb); |
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 0995c438f286..76b295a18185 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
@@ -971,7 +971,7 @@ out: spin_lock_irqsave(&adapter->stats_lock, flags); | |||
971 | spin_unlock_irqrestore(&adapter->stats_lock, flags); | 971 | spin_unlock_irqrestore(&adapter->stats_lock, flags); |
972 | 972 | ||
973 | dev_kfree_skb(skb); | 973 | dev_kfree_skb(skb); |
974 | return 0; | 974 | return NETDEV_TX_OK; |
975 | } | 975 | } |
976 | 976 | ||
977 | static int ibmveth_poll(struct napi_struct *napi, int budget) | 977 | static int ibmveth_poll(struct napi_struct *napi, int budget) |
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index e3cfefab670c..8ec15ab8c8c2 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c | |||
@@ -1515,7 +1515,7 @@ static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1515 | 1515 | ||
1516 | spin_unlock_irq(&ip->ioc3_lock); | 1516 | spin_unlock_irq(&ip->ioc3_lock); |
1517 | 1517 | ||
1518 | return 0; | 1518 | return NETDEV_TX_OK; |
1519 | } | 1519 | } |
1520 | 1520 | ||
1521 | static void ioc3_timeout(struct net_device *dev) | 1521 | static void ioc3_timeout(struct net_device *dev) |
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index ad1795580028..709835782443 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -1466,7 +1466,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1466 | dev->trans_start = jiffies; | 1466 | dev->trans_start = jiffies; |
1467 | spin_unlock_irqrestore(&self->lock, flags); | 1467 | spin_unlock_irqrestore(&self->lock, flags); |
1468 | dev_kfree_skb(skb); | 1468 | dev_kfree_skb(skb); |
1469 | return 0; | 1469 | return NETDEV_TX_OK; |
1470 | } else | 1470 | } else |
1471 | self->new_speed = speed; | 1471 | self->new_speed = speed; |
1472 | } | 1472 | } |
@@ -1577,7 +1577,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1577 | dev_kfree_skb(skb); | 1577 | dev_kfree_skb(skb); |
1578 | 1578 | ||
1579 | IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ ); | 1579 | IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ ); |
1580 | return 0; | 1580 | return NETDEV_TX_OK; |
1581 | } | 1581 | } |
1582 | 1582 | ||
1583 | 1583 | ||
@@ -1991,7 +1991,7 @@ static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1991 | dev->trans_start = jiffies; | 1991 | dev->trans_start = jiffies; |
1992 | spin_unlock_irqrestore(&self->lock, flags); | 1992 | spin_unlock_irqrestore(&self->lock, flags); |
1993 | dev_kfree_skb(skb); | 1993 | dev_kfree_skb(skb); |
1994 | return 0; | 1994 | return NETDEV_TX_OK; |
1995 | } else | 1995 | } else |
1996 | self->new_speed = speed; | 1996 | self->new_speed = speed; |
1997 | } | 1997 | } |
@@ -2015,7 +2015,7 @@ static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2015 | 2015 | ||
2016 | IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ ); | 2016 | IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ ); |
2017 | 2017 | ||
2018 | return 0; | 2018 | return NETDEV_TX_OK; |
2019 | } | 2019 | } |
2020 | 2020 | ||
2021 | 2021 | ||
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c index c4361d466597..22baf65e1563 100644 --- a/drivers/net/irda/au1k_ir.c +++ b/drivers/net/irda/au1k_ir.c | |||
@@ -502,7 +502,7 @@ static int au1k_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
502 | aup->newspeed = 0; | 502 | aup->newspeed = 0; |
503 | } | 503 | } |
504 | dev_kfree_skb(skb); | 504 | dev_kfree_skb(skb); |
505 | return 0; | 505 | return NETDEV_TX_OK; |
506 | } | 506 | } |
507 | 507 | ||
508 | ptxd = aup->tx_ring[aup->tx_head]; | 508 | ptxd = aup->tx_ring[aup->tx_head]; |
@@ -555,7 +555,7 @@ static int au1k_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
555 | dev_kfree_skb(skb); | 555 | dev_kfree_skb(skb); |
556 | aup->tx_head = (aup->tx_head + 1) & (NUM_IR_DESC - 1); | 556 | aup->tx_head = (aup->tx_head + 1) & (NUM_IR_DESC - 1); |
557 | dev->trans_start = jiffies; | 557 | dev->trans_start = jiffies; |
558 | return 0; | 558 | return NETDEV_TX_OK; |
559 | } | 559 | } |
560 | 560 | ||
561 | 561 | ||
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c index 9a0346e751ac..1484c76becfb 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/net/irda/donauboe.c | |||
@@ -1021,7 +1021,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev) | |||
1021 | { | 1021 | { |
1022 | spin_unlock_irqrestore(&self->spinlock, flags); | 1022 | spin_unlock_irqrestore(&self->spinlock, flags); |
1023 | dev_kfree_skb (skb); | 1023 | dev_kfree_skb (skb); |
1024 | return 0; | 1024 | return NETDEV_TX_OK; |
1025 | } | 1025 | } |
1026 | /* True packet, go on, but */ | 1026 | /* True packet, go on, but */ |
1027 | /* do not accept anything before change speed execution */ | 1027 | /* do not accept anything before change speed execution */ |
@@ -1036,7 +1036,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev) | |||
1036 | toshoboe_setbaud (self); | 1036 | toshoboe_setbaud (self); |
1037 | spin_unlock_irqrestore(&self->spinlock, flags); | 1037 | spin_unlock_irqrestore(&self->spinlock, flags); |
1038 | dev_kfree_skb (skb); | 1038 | dev_kfree_skb (skb); |
1039 | return 0; | 1039 | return NETDEV_TX_OK; |
1040 | } | 1040 | } |
1041 | 1041 | ||
1042 | } | 1042 | } |
@@ -1143,7 +1143,7 @@ dumpbufs(skb->data,skb->len,'>'); | |||
1143 | spin_unlock_irqrestore(&self->spinlock, flags); | 1143 | spin_unlock_irqrestore(&self->spinlock, flags); |
1144 | dev_kfree_skb (skb); | 1144 | dev_kfree_skb (skb); |
1145 | 1145 | ||
1146 | return 0; | 1146 | return NETDEV_TX_OK; |
1147 | } | 1147 | } |
1148 | 1148 | ||
1149 | /*interrupt handler */ | 1149 | /*interrupt handler */ |
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c index 0c0831c03f64..6a1aa7a40fe2 100644 --- a/drivers/net/irda/irda-usb.c +++ b/drivers/net/irda/irda-usb.c | |||
@@ -534,7 +534,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
534 | } | 534 | } |
535 | spin_unlock_irqrestore(&self->lock, flags); | 535 | spin_unlock_irqrestore(&self->lock, flags); |
536 | 536 | ||
537 | return 0; | 537 | return NETDEV_TX_OK; |
538 | 538 | ||
539 | drop: | 539 | drop: |
540 | /* Drop silently the skb and exit */ | 540 | /* Drop silently the skb and exit */ |
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index 45fd9c1eb343..05bfc987b34b 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -1397,7 +1397,7 @@ static int nsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev) | |||
1397 | dev->trans_start = jiffies; | 1397 | dev->trans_start = jiffies; |
1398 | spin_unlock_irqrestore(&self->lock, flags); | 1398 | spin_unlock_irqrestore(&self->lock, flags); |
1399 | dev_kfree_skb(skb); | 1399 | dev_kfree_skb(skb); |
1400 | return 0; | 1400 | return NETDEV_TX_OK; |
1401 | } else | 1401 | } else |
1402 | self->new_speed = speed; | 1402 | self->new_speed = speed; |
1403 | } | 1403 | } |
@@ -1424,7 +1424,7 @@ static int nsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev) | |||
1424 | 1424 | ||
1425 | dev_kfree_skb(skb); | 1425 | dev_kfree_skb(skb); |
1426 | 1426 | ||
1427 | return 0; | 1427 | return NETDEV_TX_OK; |
1428 | } | 1428 | } |
1429 | 1429 | ||
1430 | static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev) | 1430 | static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev) |
@@ -1467,7 +1467,7 @@ static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev) | |||
1467 | dev->trans_start = jiffies; | 1467 | dev->trans_start = jiffies; |
1468 | spin_unlock_irqrestore(&self->lock, flags); | 1468 | spin_unlock_irqrestore(&self->lock, flags); |
1469 | dev_kfree_skb(skb); | 1469 | dev_kfree_skb(skb); |
1470 | return 0; | 1470 | return NETDEV_TX_OK; |
1471 | } else { | 1471 | } else { |
1472 | /* Change speed after current frame */ | 1472 | /* Change speed after current frame */ |
1473 | self->new_speed = speed; | 1473 | self->new_speed = speed; |
@@ -1554,7 +1554,7 @@ static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev) | |||
1554 | spin_unlock_irqrestore(&self->lock, flags); | 1554 | spin_unlock_irqrestore(&self->lock, flags); |
1555 | dev_kfree_skb(skb); | 1555 | dev_kfree_skb(skb); |
1556 | 1556 | ||
1557 | return 0; | 1557 | return NETDEV_TX_OK; |
1558 | } | 1558 | } |
1559 | 1559 | ||
1560 | /* | 1560 | /* |
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index 3376a4f39e0a..e76a083f901a 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c | |||
@@ -504,7 +504,7 @@ static int pxa_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
504 | pxa_irda_set_speed(si, speed); | 504 | pxa_irda_set_speed(si, speed); |
505 | } | 505 | } |
506 | dev_kfree_skb(skb); | 506 | dev_kfree_skb(skb); |
507 | return 0; | 507 | return NETDEV_TX_OK; |
508 | } | 508 | } |
509 | 509 | ||
510 | netif_stop_queue(dev); | 510 | netif_stop_queue(dev); |
@@ -539,7 +539,7 @@ static int pxa_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
539 | 539 | ||
540 | dev_kfree_skb(skb); | 540 | dev_kfree_skb(skb); |
541 | dev->trans_start = jiffies; | 541 | dev->trans_start = jiffies; |
542 | return 0; | 542 | return NETDEV_TX_OK; |
543 | } | 543 | } |
544 | 544 | ||
545 | static int pxa_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd) | 545 | static int pxa_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd) |
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index 2aeb2e6aec1b..70e6acc597b0 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c | |||
@@ -667,7 +667,7 @@ static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
667 | sa1100_irda_set_speed(si, speed); | 667 | sa1100_irda_set_speed(si, speed); |
668 | } | 668 | } |
669 | dev_kfree_skb(skb); | 669 | dev_kfree_skb(skb); |
670 | return 0; | 670 | return NETDEV_TX_OK; |
671 | } | 671 | } |
672 | 672 | ||
673 | if (!IS_FIR(si)) { | 673 | if (!IS_FIR(si)) { |
@@ -715,7 +715,7 @@ static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
715 | 715 | ||
716 | dev->trans_start = jiffies; | 716 | dev->trans_start = jiffies; |
717 | 717 | ||
718 | return 0; | 718 | return NETDEV_TX_OK; |
719 | } | 719 | } |
720 | 720 | ||
721 | static int | 721 | static int |
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c index fd0796c3db3c..bde004f0a7a3 100644 --- a/drivers/net/irda/sir_dev.c +++ b/drivers/net/irda/sir_dev.c | |||
@@ -621,7 +621,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
621 | */ | 621 | */ |
622 | 622 | ||
623 | dev_kfree_skb_any(skb); | 623 | dev_kfree_skb_any(skb); |
624 | return 0; | 624 | return NETDEV_TX_OK; |
625 | } else | 625 | } else |
626 | dev->new_speed = speed; | 626 | dev->new_speed = speed; |
627 | } | 627 | } |
@@ -668,7 +668,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
668 | } | 668 | } |
669 | spin_unlock_irqrestore(&dev->tx_lock, flags); | 669 | spin_unlock_irqrestore(&dev->tx_lock, flags); |
670 | 670 | ||
671 | return 0; | 671 | return NETDEV_TX_OK; |
672 | } | 672 | } |
673 | 673 | ||
674 | /* called from network layer with rtnl hold */ | 674 | /* called from network layer with rtnl hold */ |
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c index 8e5e45caf2f1..c475b23091bc 100644 --- a/drivers/net/irda/stir4200.c +++ b/drivers/net/irda/stir4200.c | |||
@@ -578,7 +578,7 @@ static int stir_hard_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
578 | dev_kfree_skb(skb); | 578 | dev_kfree_skb(skb); |
579 | } | 579 | } |
580 | 580 | ||
581 | return 0; | 581 | return NETDEV_TX_OK; |
582 | } | 582 | } |
583 | 583 | ||
584 | /* | 584 | /* |
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 864798502ff9..62ba94ba7c9e 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
@@ -844,7 +844,7 @@ static int via_ircc_hard_xmit_sir(struct sk_buff *skb, | |||
844 | via_ircc_change_speed(self, speed); | 844 | via_ircc_change_speed(self, speed); |
845 | dev->trans_start = jiffies; | 845 | dev->trans_start = jiffies; |
846 | dev_kfree_skb(skb); | 846 | dev_kfree_skb(skb); |
847 | return 0; | 847 | return NETDEV_TX_OK; |
848 | } else | 848 | } else |
849 | self->new_speed = speed; | 849 | self->new_speed = speed; |
850 | } | 850 | } |
@@ -892,7 +892,7 @@ static int via_ircc_hard_xmit_sir(struct sk_buff *skb, | |||
892 | dev->trans_start = jiffies; | 892 | dev->trans_start = jiffies; |
893 | spin_unlock_irqrestore(&self->lock, flags); | 893 | spin_unlock_irqrestore(&self->lock, flags); |
894 | dev_kfree_skb(skb); | 894 | dev_kfree_skb(skb); |
895 | return 0; | 895 | return NETDEV_TX_OK; |
896 | } | 896 | } |
897 | 897 | ||
898 | static int via_ircc_hard_xmit_fir(struct sk_buff *skb, | 898 | static int via_ircc_hard_xmit_fir(struct sk_buff *skb, |
@@ -907,7 +907,7 @@ static int via_ircc_hard_xmit_fir(struct sk_buff *skb, | |||
907 | iobase = self->io.fir_base; | 907 | iobase = self->io.fir_base; |
908 | 908 | ||
909 | if (self->st_fifo.len) | 909 | if (self->st_fifo.len) |
910 | return 0; | 910 | return NETDEV_TX_OK; |
911 | if (self->chip_id == 0x3076) | 911 | if (self->chip_id == 0x3076) |
912 | iodelay(1500); | 912 | iodelay(1500); |
913 | else | 913 | else |
@@ -919,7 +919,7 @@ static int via_ircc_hard_xmit_fir(struct sk_buff *skb, | |||
919 | via_ircc_change_speed(self, speed); | 919 | via_ircc_change_speed(self, speed); |
920 | dev->trans_start = jiffies; | 920 | dev->trans_start = jiffies; |
921 | dev_kfree_skb(skb); | 921 | dev_kfree_skb(skb); |
922 | return 0; | 922 | return NETDEV_TX_OK; |
923 | } else | 923 | } else |
924 | self->new_speed = speed; | 924 | self->new_speed = speed; |
925 | } | 925 | } |
@@ -940,7 +940,7 @@ static int via_ircc_hard_xmit_fir(struct sk_buff *skb, | |||
940 | dev->trans_start = jiffies; | 940 | dev->trans_start = jiffies; |
941 | dev_kfree_skb(skb); | 941 | dev_kfree_skb(skb); |
942 | spin_unlock_irqrestore(&self->lock, flags); | 942 | spin_unlock_irqrestore(&self->lock, flags); |
943 | return 0; | 943 | return NETDEV_TX_OK; |
944 | 944 | ||
945 | } | 945 | } |
946 | 946 | ||
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index ac0e4b6b6b66..08e26f1297b4 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
@@ -915,7 +915,7 @@ static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
915 | */ | 915 | */ |
916 | spin_unlock_irqrestore(&idev->lock, flags); | 916 | spin_unlock_irqrestore(&idev->lock, flags); |
917 | dev_kfree_skb_any(skb); | 917 | dev_kfree_skb_any(skb); |
918 | return 0; | 918 | return NETDEV_TX_OK; |
919 | } | 919 | } |
920 | 920 | ||
921 | /* sanity checks - simply drop the packet */ | 921 | /* sanity checks - simply drop the packet */ |
@@ -1044,7 +1044,7 @@ static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
1044 | } | 1044 | } |
1045 | spin_unlock_irqrestore(&idev->lock, flags); | 1045 | spin_unlock_irqrestore(&idev->lock, flags); |
1046 | 1046 | ||
1047 | return 0; | 1047 | return NETDEV_TX_OK; |
1048 | 1048 | ||
1049 | drop_unlock: | 1049 | drop_unlock: |
1050 | spin_unlock_irqrestore(&idev->lock, flags); | 1050 | spin_unlock_irqrestore(&idev->lock, flags); |
@@ -1058,7 +1058,7 @@ drop: | |||
1058 | * packet for later retry of transmission - which isn't exactly | 1058 | * packet for later retry of transmission - which isn't exactly |
1059 | * what we want after we've just called dev_kfree_skb_any ;-) | 1059 | * what we want after we've just called dev_kfree_skb_any ;-) |
1060 | */ | 1060 | */ |
1061 | return 0; | 1061 | return NETDEV_TX_OK; |
1062 | } | 1062 | } |
1063 | 1063 | ||
1064 | static void vlsi_tx_interrupt(struct net_device *ndev) | 1064 | static void vlsi_tx_interrupt(struct net_device *ndev) |
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index d0883835b0c6..49ef76320f51 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c | |||
@@ -516,7 +516,7 @@ static int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
516 | w83977af_change_speed(self, speed); | 516 | w83977af_change_speed(self, speed); |
517 | dev->trans_start = jiffies; | 517 | dev->trans_start = jiffies; |
518 | dev_kfree_skb(skb); | 518 | dev_kfree_skb(skb); |
519 | return 0; | 519 | return NETDEV_TX_OK; |
520 | } else | 520 | } else |
521 | self->new_speed = speed; | 521 | self->new_speed = speed; |
522 | } | 522 | } |
@@ -576,7 +576,7 @@ static int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
576 | /* Restore set register */ | 576 | /* Restore set register */ |
577 | outb(set, iobase+SSR); | 577 | outb(set, iobase+SSR); |
578 | 578 | ||
579 | return 0; | 579 | return NETDEV_TX_OK; |
580 | } | 580 | } |
581 | 581 | ||
582 | /* | 582 | /* |
diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c index 73585fd8f29f..86d2300af379 100644 --- a/drivers/net/isa-skeleton.c +++ b/drivers/net/isa-skeleton.c | |||
@@ -467,7 +467,7 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
467 | dev_kfree_skb (skb); | 467 | dev_kfree_skb (skb); |
468 | #endif | 468 | #endif |
469 | 469 | ||
470 | return 0; | 470 | return NETDEV_TX_OK; |
471 | } | 471 | } |
472 | 472 | ||
473 | #if TX_RING | 473 | #if TX_RING |
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index e44215cb1882..e36e951cbc65 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
@@ -1205,7 +1205,7 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1205 | 1205 | ||
1206 | if ( ! ((1 << rlp) & port->lpar_map) ) { | 1206 | if ( ! ((1 << rlp) & port->lpar_map) ) { |
1207 | dev_kfree_skb(skb); | 1207 | dev_kfree_skb(skb); |
1208 | return 0; | 1208 | return NETDEV_TX_OK; |
1209 | } | 1209 | } |
1210 | 1210 | ||
1211 | lpmask = 1 << rlp; | 1211 | lpmask = 1 << rlp; |
@@ -1217,7 +1217,7 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1217 | 1217 | ||
1218 | dev_kfree_skb(skb); | 1218 | dev_kfree_skb(skb); |
1219 | 1219 | ||
1220 | return 0; | 1220 | return NETDEV_TX_OK; |
1221 | } | 1221 | } |
1222 | 1222 | ||
1223 | /* You must hold the connection's lock when you call this function. */ | 1223 | /* You must hold the connection's lock when you call this function. */ |
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index 9c897cf86b9f..eb917f160274 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -1459,7 +1459,7 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
1459 | 1459 | ||
1460 | if (skb->len <= 0) { | 1460 | if (skb->len <= 0) { |
1461 | dev_kfree_skb(skb); | 1461 | dev_kfree_skb(skb); |
1462 | return 0; | 1462 | return NETDEV_TX_OK; |
1463 | } | 1463 | } |
1464 | 1464 | ||
1465 | if (unlikely(ixgb_maybe_stop_tx(netdev, &adapter->tx_ring, | 1465 | if (unlikely(ixgb_maybe_stop_tx(netdev, &adapter->tx_ring, |
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c index 2a0174b62e96..588b44d944ce 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ixp2000/ixpdev.c | |||
@@ -45,7 +45,7 @@ static int ixpdev_xmit(struct sk_buff *skb, struct net_device *dev) | |||
45 | if (unlikely(skb->len > PAGE_SIZE)) { | 45 | if (unlikely(skb->len > PAGE_SIZE)) { |
46 | /* @@@ Count drops. */ | 46 | /* @@@ Count drops. */ |
47 | dev_kfree_skb(skb); | 47 | dev_kfree_skb(skb); |
48 | return 0; | 48 | return NETDEV_TX_OK; |
49 | } | 49 | } |
50 | 50 | ||
51 | entry = tx_pointer; | 51 | entry = tx_pointer; |
@@ -69,7 +69,7 @@ static int ixpdev_xmit(struct sk_buff *skb, struct net_device *dev) | |||
69 | netif_stop_queue(dev); | 69 | netif_stop_queue(dev); |
70 | local_irq_enable(); | 70 | local_irq_enable(); |
71 | 71 | ||
72 | return 0; | 72 | return NETDEV_TX_OK; |
73 | } | 73 | } |
74 | 74 | ||
75 | 75 | ||
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index 633808d447be..30fd4f5f1d5a 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
@@ -1016,7 +1016,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1016 | 1016 | ||
1017 | out: | 1017 | out: |
1018 | spin_unlock_irqrestore(&lp->devlock, flags); | 1018 | spin_unlock_irqrestore(&lp->devlock, flags); |
1019 | return 0; | 1019 | return NETDEV_TX_OK; |
1020 | } | 1020 | } |
1021 | 1021 | ||
1022 | /* The LANCE interrupt handler. */ | 1022 | /* The LANCE interrupt handler. */ |
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index 070fa4500871..51e11c3e53e1 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
@@ -983,7 +983,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
983 | 983 | ||
984 | if (length < ETH_ZLEN) { | 984 | if (length < ETH_ZLEN) { |
985 | if (skb_padto(skb, ETH_ZLEN)) | 985 | if (skb_padto(skb, ETH_ZLEN)) |
986 | return 0; | 986 | return NETDEV_TX_OK; |
987 | length = ETH_ZLEN; | 987 | length = ETH_ZLEN; |
988 | } | 988 | } |
989 | 989 | ||
@@ -1028,7 +1028,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1028 | 1028 | ||
1029 | netif_start_queue(dev); | 1029 | netif_start_queue(dev); |
1030 | 1030 | ||
1031 | return 0; | 1031 | return NETDEV_TX_OK; |
1032 | } | 1032 | } |
1033 | 1033 | ||
1034 | static void print_eth(unsigned char *add, char *str) | 1034 | static void print_eth(unsigned char *add, char *str) |
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index 96e7248876c1..da8d0a0ca94f 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c | |||
@@ -591,7 +591,7 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
591 | /* Kick off the transfer */ | 591 | /* Kick off the transfer */ |
592 | temac_dma_out32(lp, TX_TAILDESC_PTR, tail_p); /* DMA start */ | 592 | temac_dma_out32(lp, TX_TAILDESC_PTR, tail_p); /* DMA start */ |
593 | 593 | ||
594 | return 0; | 594 | return NETDEV_TX_OK; |
595 | } | 595 | } |
596 | 596 | ||
597 | 597 | ||
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index da472c687481..51bbce72bede 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c | |||
@@ -89,7 +89,7 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) | |||
89 | } else | 89 | } else |
90 | lb_stats->drops++; | 90 | lb_stats->drops++; |
91 | 91 | ||
92 | return 0; | 92 | return NETDEV_TX_OK; |
93 | } | 93 | } |
94 | 94 | ||
95 | static struct net_device_stats *loopback_get_stats(struct net_device *dev) | 95 | static struct net_device_stats *loopback_get_stats(struct net_device *dev) |
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index d44bddbee373..c292bad411ee 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c | |||
@@ -871,7 +871,7 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) { | |||
871 | 871 | ||
872 | if (length < ETH_ZLEN) { | 872 | if (length < ETH_ZLEN) { |
873 | if (skb_padto(skb, ETH_ZLEN)) | 873 | if (skb_padto(skb, ETH_ZLEN)) |
874 | return 0; | 874 | return NETDEV_TX_OK; |
875 | length = ETH_ZLEN; | 875 | length = ETH_ZLEN; |
876 | } | 876 | } |
877 | 877 | ||
@@ -906,7 +906,7 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) { | |||
906 | dev->stats.tx_packets++; | 906 | dev->stats.tx_packets++; |
907 | } | 907 | } |
908 | 908 | ||
909 | return 0; | 909 | return NETDEV_TX_OK; |
910 | } | 910 | } |
911 | 911 | ||
912 | static void | 912 | static void |
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c index dab45339d3a8..149e0ed4a055 100644 --- a/drivers/net/mac89x0.c +++ b/drivers/net/mac89x0.c | |||
@@ -411,7 +411,7 @@ net_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
411 | dev->trans_start = jiffies; | 411 | dev->trans_start = jiffies; |
412 | dev_kfree_skb (skb); | 412 | dev_kfree_skb (skb); |
413 | 413 | ||
414 | return 0; | 414 | return NETDEV_TX_OK; |
415 | } | 415 | } |
416 | 416 | ||
417 | /* The typical workload of the driver: | 417 | /* The typical workload of the driver: |
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 5b5c25368d1e..d22952c78f13 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c | |||
@@ -678,7 +678,7 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
678 | 678 | ||
679 | dev->trans_start = jiffies; | 679 | dev->trans_start = jiffies; |
680 | 680 | ||
681 | return 0; | 681 | return NETDEV_TX_OK; |
682 | } | 682 | } |
683 | 683 | ||
684 | static void macb_free_consistent(struct macb *bp) | 684 | static void macb_free_consistent(struct macb *bp) |
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index 1427755c224d..7d7577b598ea 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
@@ -581,7 +581,7 @@ static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev) | |||
581 | netif_stop_queue(dev); | 581 | netif_stop_queue(dev); |
582 | spin_unlock_irqrestore(&mp->lock, flags); | 582 | spin_unlock_irqrestore(&mp->lock, flags); |
583 | 583 | ||
584 | return 0; | 584 | return NETDEV_TX_OK; |
585 | } | 585 | } |
586 | 586 | ||
587 | static void mace_set_multicast(struct net_device *dev) | 587 | static void mace_set_multicast(struct net_device *dev) |
diff --git a/drivers/net/meth.c b/drivers/net/meth.c index 5d04d94f2a21..abea35de255f 100644 --- a/drivers/net/meth.c +++ b/drivers/net/meth.c | |||
@@ -715,7 +715,7 @@ static int meth_tx(struct sk_buff *skb, struct net_device *dev) | |||
715 | 715 | ||
716 | spin_unlock_irqrestore(&priv->meth_lock, flags); | 716 | spin_unlock_irqrestore(&priv->meth_lock, flags); |
717 | 717 | ||
718 | return 0; | 718 | return NETDEV_TX_OK; |
719 | } | 719 | } |
720 | 720 | ||
721 | /* | 721 | /* |
diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c index b3b9a147d09a..8ea98bd89ff1 100644 --- a/drivers/net/mipsnet.c +++ b/drivers/net/mipsnet.c | |||
@@ -141,7 +141,7 @@ static int mipsnet_xmit(struct sk_buff *skb, struct net_device *dev) | |||
141 | netif_stop_queue(dev); | 141 | netif_stop_queue(dev); |
142 | mipsnet_put_todevice(dev, skb); | 142 | mipsnet_put_todevice(dev, skb); |
143 | 143 | ||
144 | return 0; | 144 | return NETDEV_TX_OK; |
145 | } | 145 | } |
146 | 146 | ||
147 | static inline ssize_t mipsnet_get_fromdev(struct net_device *dev, size_t len) | 147 | static inline ssize_t mipsnet_get_fromdev(struct net_device *dev, size_t len) |
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 1f6e36ea669e..05cd24d0d0c6 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -2748,7 +2748,7 @@ again: | |||
2748 | /* The packet is gone, so we must | 2748 | /* The packet is gone, so we must |
2749 | * return 0 */ | 2749 | * return 0 */ |
2750 | ss->stats.tx_dropped += 1; | 2750 | ss->stats.tx_dropped += 1; |
2751 | return 0; | 2751 | return NETDEV_TX_OK; |
2752 | } | 2752 | } |
2753 | /* adjust the len to account for the zero pad | 2753 | /* adjust the len to account for the zero pad |
2754 | * so that the nic can know how long it is */ | 2754 | * so that the nic can know how long it is */ |
@@ -2892,7 +2892,7 @@ again: | |||
2892 | tx->stop_queue++; | 2892 | tx->stop_queue++; |
2893 | netif_tx_stop_queue(netdev_queue); | 2893 | netif_tx_stop_queue(netdev_queue); |
2894 | } | 2894 | } |
2895 | return 0; | 2895 | return NETDEV_TX_OK; |
2896 | 2896 | ||
2897 | abort_linearize: | 2897 | abort_linearize: |
2898 | /* Free any DMA resources we've alloced and clear out the skb | 2898 | /* Free any DMA resources we've alloced and clear out the skb |
@@ -2936,7 +2936,7 @@ abort_linearize: | |||
2936 | drop: | 2936 | drop: |
2937 | dev_kfree_skb_any(skb); | 2937 | dev_kfree_skb_any(skb); |
2938 | ss->stats.tx_dropped += 1; | 2938 | ss->stats.tx_dropped += 1; |
2939 | return 0; | 2939 | return NETDEV_TX_OK; |
2940 | 2940 | ||
2941 | } | 2941 | } |
2942 | 2942 | ||
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index 5f0758bda6b3..29ebebc6a95b 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
@@ -692,7 +692,7 @@ static int myri_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
692 | DTX(("tbusy=0, returning 0\n")); | 692 | DTX(("tbusy=0, returning 0\n")); |
693 | netif_start_queue(dev); | 693 | netif_start_queue(dev); |
694 | spin_unlock_irqrestore(&mp->irq_lock, flags); | 694 | spin_unlock_irqrestore(&mp->irq_lock, flags); |
695 | return 0; | 695 | return NETDEV_TX_OK; |
696 | } | 696 | } |
697 | 697 | ||
698 | /* Create the MyriNet MAC header for an arbitrary protocol layer | 698 | /* Create the MyriNet MAC header for an arbitrary protocol layer |
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index c9bfe4eea189..481aa2d287a3 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -2125,7 +2125,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev) | |||
2125 | printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n", | 2125 | printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n", |
2126 | dev->name, np->cur_tx, entry); | 2126 | dev->name, np->cur_tx, entry); |
2127 | } | 2127 | } |
2128 | return 0; | 2128 | return NETDEV_TX_OK; |
2129 | } | 2129 | } |
2130 | 2130 | ||
2131 | static void netdev_tx_done(struct net_device *dev) | 2131 | static void netdev_tx_done(struct net_device *dev) |
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c index 946366dcc992..9f4235466d59 100644 --- a/drivers/net/netx-eth.c +++ b/drivers/net/netx-eth.c | |||
@@ -134,7 +134,7 @@ netx_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
134 | spin_unlock_irq(&priv->lock); | 134 | spin_unlock_irq(&priv->lock); |
135 | dev_kfree_skb(skb); | 135 | dev_kfree_skb(skb); |
136 | 136 | ||
137 | return 0; | 137 | return NETDEV_TX_OK; |
138 | } | 138 | } |
139 | 139 | ||
140 | static void netx_eth_receive(struct net_device *ndev) | 140 | static void netx_eth_receive(struct net_device *ndev) |
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c index 2a8da476ab3d..462d20f26436 100644 --- a/drivers/net/ni5010.c +++ b/drivers/net/ni5010.c | |||
@@ -463,7 +463,7 @@ static int ni5010_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
463 | hardware_send_packet(dev, (unsigned char *)skb->data, skb->len, length-skb->len); | 463 | hardware_send_packet(dev, (unsigned char *)skb->data, skb->len, length-skb->len); |
464 | dev->trans_start = jiffies; | 464 | dev->trans_start = jiffies; |
465 | dev_kfree_skb (skb); | 465 | dev_kfree_skb (skb); |
466 | return 0; | 466 | return NETDEV_TX_OK; |
467 | } | 467 | } |
468 | 468 | ||
469 | /* | 469 | /* |
diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c index 1f10ed603e20..81a061785898 100644 --- a/drivers/net/ni65.c +++ b/drivers/net/ni65.c | |||
@@ -1216,7 +1216,7 @@ static int ni65_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1216 | spin_unlock_irqrestore(&p->ring_lock, flags); | 1216 | spin_unlock_irqrestore(&p->ring_lock, flags); |
1217 | } | 1217 | } |
1218 | 1218 | ||
1219 | return 0; | 1219 | return NETDEV_TX_OK; |
1220 | } | 1220 | } |
1221 | 1221 | ||
1222 | static void set_multicast_list(struct net_device *dev) | 1222 | static void set_multicast_list(struct net_device *dev) |
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index 8c1f6988f398..e4a93b8ed485 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
@@ -1356,7 +1356,7 @@ static int netdrv_start_xmit (struct sk_buff *skb, struct net_device *dev) | |||
1356 | DPRINTK ("%s: Queued Tx packet at %p size %u to slot %d.\n", | 1356 | DPRINTK ("%s: Queued Tx packet at %p size %u to slot %d.\n", |
1357 | dev->name, skb->data, skb->len, entry); | 1357 | dev->name, skb->data, skb->len, entry); |
1358 | 1358 | ||
1359 | return 0; | 1359 | return NETDEV_TX_OK; |
1360 | } | 1360 | } |
1361 | 1361 | ||
1362 | 1362 | ||
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index f35c609ba020..a23aa8724042 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -806,7 +806,7 @@ static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
806 | pop_tx_status(dev); | 806 | pop_tx_status(dev); |
807 | spin_unlock_irqrestore(&lp->window_lock, flags); | 807 | spin_unlock_irqrestore(&lp->window_lock, flags); |
808 | dev_kfree_skb(skb); | 808 | dev_kfree_skb(skb); |
809 | return 0; | 809 | return NETDEV_TX_OK; |
810 | } | 810 | } |
811 | 811 | ||
812 | /* The EL3 interrupt handler. */ | 812 | /* The EL3 interrupt handler. */ |
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index ec7cf5ac4f05..a77417c51e44 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
@@ -635,7 +635,7 @@ static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
635 | spin_unlock_irqrestore(&priv->lock, flags); | 635 | spin_unlock_irqrestore(&priv->lock, flags); |
636 | dev_kfree_skb(skb); | 636 | dev_kfree_skb(skb); |
637 | 637 | ||
638 | return 0; | 638 | return NETDEV_TX_OK; |
639 | } | 639 | } |
640 | 640 | ||
641 | /* The EL3 interrupt handler. */ | 641 | /* The EL3 interrupt handler. */ |
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 0e38d80fd255..b5cfac7c5179 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -1179,7 +1179,7 @@ static int axnet_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1179 | dev_kfree_skb (skb); | 1179 | dev_kfree_skb (skb); |
1180 | dev->stats.tx_bytes += send_length; | 1180 | dev->stats.tx_bytes += send_length; |
1181 | 1181 | ||
1182 | return 0; | 1182 | return NETDEV_TX_OK; |
1183 | } | 1183 | } |
1184 | 1184 | ||
1185 | /** | 1185 | /** |
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 479d5b494371..434d9407bfb3 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -865,7 +865,7 @@ static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
865 | if (length < ETH_ZLEN) | 865 | if (length < ETH_ZLEN) |
866 | { | 866 | { |
867 | if (skb_padto(skb, ETH_ZLEN)) | 867 | if (skb_padto(skb, ETH_ZLEN)) |
868 | return 0; | 868 | return NETDEV_TX_OK; |
869 | length = ETH_ZLEN; | 869 | length = ETH_ZLEN; |
870 | } | 870 | } |
871 | 871 | ||
@@ -924,7 +924,7 @@ static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
924 | } | 924 | } |
925 | dev_kfree_skb (skb); | 925 | dev_kfree_skb (skb); |
926 | 926 | ||
927 | return 0; | 927 | return NETDEV_TX_OK; |
928 | } /* fjn_start_xmit */ | 928 | } /* fjn_start_xmit */ |
929 | 929 | ||
930 | /*====================================================================*/ | 930 | /*====================================================================*/ |
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 02ef63ed1f99..0f8118a82579 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -990,7 +990,7 @@ static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
990 | 990 | ||
991 | dev_kfree_skb(skb); | 991 | dev_kfree_skb(skb); |
992 | 992 | ||
993 | return 0; | 993 | return NETDEV_TX_OK; |
994 | } /* mace_start_xmit */ | 994 | } /* mace_start_xmit */ |
995 | 995 | ||
996 | /* ---------------------------------------------------------------------------- | 996 | /* ---------------------------------------------------------------------------- |
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index 37e05d3ab893..2f39244c17f2 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
@@ -1399,7 +1399,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1399 | dev_kfree_skb (skb); | 1399 | dev_kfree_skb (skb); |
1400 | smc->saved_skb = NULL; | 1400 | smc->saved_skb = NULL; |
1401 | dev->stats.tx_dropped++; | 1401 | dev->stats.tx_dropped++; |
1402 | return 0; /* Do not re-queue this packet. */ | 1402 | return NETDEV_TX_OK; /* Do not re-queue this packet. */ |
1403 | } | 1403 | } |
1404 | /* A packet is now waiting. */ | 1404 | /* A packet is now waiting. */ |
1405 | smc->packets_waiting++; | 1405 | smc->packets_waiting++; |
@@ -1422,7 +1422,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1422 | outw((ir&0xff00) | IM_ALLOC_INT, ioaddr + INTERRUPT); | 1422 | outw((ir&0xff00) | IM_ALLOC_INT, ioaddr + INTERRUPT); |
1423 | smc_hardware_send_packet(dev); /* Send the packet now.. */ | 1423 | smc_hardware_send_packet(dev); /* Send the packet now.. */ |
1424 | spin_unlock_irqrestore(&smc->lock, flags); | 1424 | spin_unlock_irqrestore(&smc->lock, flags); |
1425 | return 0; | 1425 | return NETDEV_TX_OK; |
1426 | } | 1426 | } |
1427 | } | 1427 | } |
1428 | 1428 | ||
@@ -1431,7 +1431,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1431 | outw((IM_ALLOC_INT << 8) | (ir & 0xff00), ioaddr + INTERRUPT); | 1431 | outw((IM_ALLOC_INT << 8) | (ir & 0xff00), ioaddr + INTERRUPT); |
1432 | spin_unlock_irqrestore(&smc->lock, flags); | 1432 | spin_unlock_irqrestore(&smc->lock, flags); |
1433 | 1433 | ||
1434 | return 0; | 1434 | return NETDEV_TX_OK; |
1435 | } | 1435 | } |
1436 | 1436 | ||
1437 | /*====================================================================== | 1437 | /*====================================================================== |
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index ef37d22c7e1d..eda7bf6047cd 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -1384,7 +1384,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1384 | if (pktlen < ETH_ZLEN) | 1384 | if (pktlen < ETH_ZLEN) |
1385 | { | 1385 | { |
1386 | if (skb_padto(skb, ETH_ZLEN)) | 1386 | if (skb_padto(skb, ETH_ZLEN)) |
1387 | return 0; | 1387 | return NETDEV_TX_OK; |
1388 | pktlen = ETH_ZLEN; | 1388 | pktlen = ETH_ZLEN; |
1389 | } | 1389 | } |
1390 | 1390 | ||
@@ -1414,7 +1414,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1414 | dev->trans_start = jiffies; | 1414 | dev->trans_start = jiffies; |
1415 | dev->stats.tx_bytes += pktlen; | 1415 | dev->stats.tx_bytes += pktlen; |
1416 | netif_start_queue(dev); | 1416 | netif_start_queue(dev); |
1417 | return 0; | 1417 | return NETDEV_TX_OK; |
1418 | } | 1418 | } |
1419 | 1419 | ||
1420 | /**************** | 1420 | /**************** |
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 1c35e1d637a0..955a87ac9afa 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -2536,7 +2536,7 @@ static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2536 | netif_stop_queue(dev); | 2536 | netif_stop_queue(dev); |
2537 | } | 2537 | } |
2538 | spin_unlock_irqrestore(&lp->lock, flags); | 2538 | spin_unlock_irqrestore(&lp->lock, flags); |
2539 | return 0; | 2539 | return NETDEV_TX_OK; |
2540 | } | 2540 | } |
2541 | 2541 | ||
2542 | /* The PCNET32 interrupt handler. */ | 2542 | /* The PCNET32 interrupt handler. */ |
diff --git a/drivers/net/plip.c b/drivers/net/plip.c index 7a62f781fef2..ef2e229ebc18 100644 --- a/drivers/net/plip.c +++ b/drivers/net/plip.c | |||
@@ -987,7 +987,7 @@ plip_tx_packet(struct sk_buff *skb, struct net_device *dev) | |||
987 | schedule_work(&nl->immediate); | 987 | schedule_work(&nl->immediate); |
988 | spin_unlock_irq(&nl->lock); | 988 | spin_unlock_irq(&nl->lock); |
989 | 989 | ||
990 | return 0; | 990 | return NETDEV_TX_OK; |
991 | } | 991 | } |
992 | 992 | ||
993 | static void | 993 | static void |
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 639d11bc444e..d0b965517b46 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
@@ -988,12 +988,12 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
988 | netif_stop_queue(dev); | 988 | netif_stop_queue(dev); |
989 | skb_queue_tail(&ppp->file.xq, skb); | 989 | skb_queue_tail(&ppp->file.xq, skb); |
990 | ppp_xmit_process(ppp); | 990 | ppp_xmit_process(ppp); |
991 | return 0; | 991 | return NETDEV_TX_OK; |
992 | 992 | ||
993 | outf: | 993 | outf: |
994 | kfree_skb(skb); | 994 | kfree_skb(skb); |
995 | ++dev->stats.tx_dropped; | 995 | ++dev->stats.tx_dropped; |
996 | return 0; | 996 | return NETDEV_TX_OK; |
997 | } | 997 | } |
998 | 998 | ||
999 | static int | 999 | static int |
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c index 74cdb6f8f84f..bc98e7f69ee9 100644 --- a/drivers/net/rionet.c +++ b/drivers/net/rionet.c | |||
@@ -203,7 +203,7 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
203 | 203 | ||
204 | spin_unlock_irqrestore(&rnet->tx_lock, flags); | 204 | spin_unlock_irqrestore(&rnet->tx_lock, flags); |
205 | 205 | ||
206 | return 0; | 206 | return NETDEV_TX_OK; |
207 | } | 207 | } |
208 | 208 | ||
209 | static void rionet_dbell_event(struct rio_mport *mport, void *dev_id, u16 sid, u16 tid, | 209 | static void rionet_dbell_event(struct rio_mport *mport, void *dev_id, u16 sid, u16 tid, |
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c index 81dbcbb910f4..d95534655911 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/rrunner.c | |||
@@ -1466,7 +1466,7 @@ static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1466 | spin_unlock_irqrestore(&rrpriv->lock, flags); | 1466 | spin_unlock_irqrestore(&rrpriv->lock, flags); |
1467 | 1467 | ||
1468 | dev->trans_start = jiffies; | 1468 | dev->trans_start = jiffies; |
1469 | return 0; | 1469 | return NETDEV_TX_OK; |
1470 | } | 1470 | } |
1471 | 1471 | ||
1472 | 1472 | ||
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 458daa06ed41..d4df9330c447 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -4111,14 +4111,14 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
4111 | if (unlikely(skb->len <= 0)) { | 4111 | if (unlikely(skb->len <= 0)) { |
4112 | DBG_PRINT(TX_DBG, "%s:Buffer has no data..\n", dev->name); | 4112 | DBG_PRINT(TX_DBG, "%s:Buffer has no data..\n", dev->name); |
4113 | dev_kfree_skb_any(skb); | 4113 | dev_kfree_skb_any(skb); |
4114 | return 0; | 4114 | return NETDEV_TX_OK; |
4115 | } | 4115 | } |
4116 | 4116 | ||
4117 | if (!is_s2io_card_up(sp)) { | 4117 | if (!is_s2io_card_up(sp)) { |
4118 | DBG_PRINT(TX_DBG, "%s: Card going down for reset\n", | 4118 | DBG_PRINT(TX_DBG, "%s: Card going down for reset\n", |
4119 | dev->name); | 4119 | dev->name); |
4120 | dev_kfree_skb(skb); | 4120 | dev_kfree_skb(skb); |
4121 | return 0; | 4121 | return NETDEV_TX_OK; |
4122 | } | 4122 | } |
4123 | 4123 | ||
4124 | queue = 0; | 4124 | queue = 0; |
@@ -4192,7 +4192,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
4192 | s2io_stop_tx_queue(sp, fifo->fifo_no); | 4192 | s2io_stop_tx_queue(sp, fifo->fifo_no); |
4193 | dev_kfree_skb(skb); | 4193 | dev_kfree_skb(skb); |
4194 | spin_unlock_irqrestore(&fifo->tx_lock, flags); | 4194 | spin_unlock_irqrestore(&fifo->tx_lock, flags); |
4195 | return 0; | 4195 | return NETDEV_TX_OK; |
4196 | } | 4196 | } |
4197 | 4197 | ||
4198 | offload_type = s2io_offload_type(skb); | 4198 | offload_type = s2io_offload_type(skb); |
@@ -4304,14 +4304,14 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
4304 | if (sp->config.intr_type == MSI_X) | 4304 | if (sp->config.intr_type == MSI_X) |
4305 | tx_intr_handler(fifo); | 4305 | tx_intr_handler(fifo); |
4306 | 4306 | ||
4307 | return 0; | 4307 | return NETDEV_TX_OK; |
4308 | pci_map_failed: | 4308 | pci_map_failed: |
4309 | stats->pci_map_fail_cnt++; | 4309 | stats->pci_map_fail_cnt++; |
4310 | s2io_stop_tx_queue(sp, fifo->fifo_no); | 4310 | s2io_stop_tx_queue(sp, fifo->fifo_no); |
4311 | stats->mem_freed += skb->truesize; | 4311 | stats->mem_freed += skb->truesize; |
4312 | dev_kfree_skb(skb); | 4312 | dev_kfree_skb(skb); |
4313 | spin_unlock_irqrestore(&fifo->tx_lock, flags); | 4313 | spin_unlock_irqrestore(&fifo->tx_lock, flags); |
4314 | return 0; | 4314 | return NETDEV_TX_OK; |
4315 | } | 4315 | } |
4316 | 4316 | ||
4317 | static void | 4317 | static void |
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index fc0e38bddeeb..6a81aec645d9 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c | |||
@@ -1086,7 +1086,7 @@ sb1000_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1086 | printk(KERN_WARNING "%s: trying to transmit!!!\n", dev->name); | 1086 | printk(KERN_WARNING "%s: trying to transmit!!!\n", dev->name); |
1087 | /* sb1000 can't xmit datagrams */ | 1087 | /* sb1000 can't xmit datagrams */ |
1088 | dev_kfree_skb(skb); | 1088 | dev_kfree_skb(skb); |
1089 | return 0; | 1089 | return NETDEV_TX_OK; |
1090 | } | 1090 | } |
1091 | 1091 | ||
1092 | /* SB1000 interrupt handler. */ | 1092 | /* SB1000 interrupt handler. */ |
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index d8c9cf1b901d..4c2450b6bd0c 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
@@ -2091,7 +2091,7 @@ static int sbmac_start_tx(struct sk_buff *skb, struct net_device *dev) | |||
2091 | 2091 | ||
2092 | spin_unlock_irqrestore(&sc->sbm_lock, flags); | 2092 | spin_unlock_irqrestore(&sc->sbm_lock, flags); |
2093 | 2093 | ||
2094 | return 0; | 2094 | return NETDEV_TX_OK; |
2095 | } | 2095 | } |
2096 | 2096 | ||
2097 | /********************************************************************** | 2097 | /********************************************************************** |
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c index ebbbe09725fe..7cc8bb814137 100644 --- a/drivers/net/seeq8005.c +++ b/drivers/net/seeq8005.c | |||
@@ -401,7 +401,7 @@ static int seeq8005_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
401 | 401 | ||
402 | if (length < ETH_ZLEN) { | 402 | if (length < ETH_ZLEN) { |
403 | if (skb_padto(skb, ETH_ZLEN)) | 403 | if (skb_padto(skb, ETH_ZLEN)) |
404 | return 0; | 404 | return NETDEV_TX_OK; |
405 | length = ETH_ZLEN; | 405 | length = ETH_ZLEN; |
406 | } | 406 | } |
407 | buf = skb->data; | 407 | buf = skb->data; |
@@ -415,7 +415,7 @@ static int seeq8005_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
415 | dev_kfree_skb (skb); | 415 | dev_kfree_skb (skb); |
416 | /* You might need to clean up and record Tx statistics here. */ | 416 | /* You might need to clean up and record Tx statistics here. */ |
417 | 417 | ||
418 | return 0; | 418 | return NETDEV_TX_OK; |
419 | } | 419 | } |
420 | 420 | ||
421 | /* | 421 | /* |
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c index 5fb88ca6dd7f..78f60089b552 100644 --- a/drivers/net/sgiseeq.c +++ b/drivers/net/sgiseeq.c | |||
@@ -594,7 +594,7 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
594 | len = skb->len; | 594 | len = skb->len; |
595 | if (len < ETH_ZLEN) { | 595 | if (len < ETH_ZLEN) { |
596 | if (skb_padto(skb, ETH_ZLEN)) | 596 | if (skb_padto(skb, ETH_ZLEN)) |
597 | return 0; | 597 | return NETDEV_TX_OK; |
598 | len = ETH_ZLEN; | 598 | len = ETH_ZLEN; |
599 | } | 599 | } |
600 | 600 | ||
@@ -642,7 +642,7 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
642 | netif_stop_queue(dev); | 642 | netif_stop_queue(dev); |
643 | spin_unlock_irqrestore(&sp->tx_lock, flags); | 643 | spin_unlock_irqrestore(&sp->tx_lock, flags); |
644 | 644 | ||
645 | return 0; | 645 | return NETDEV_TX_OK; |
646 | } | 646 | } |
647 | 647 | ||
648 | static void timeout(struct net_device *dev) | 648 | static void timeout(struct net_device *dev) |
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index a2d82ddb3b4d..4c4dcbf19026 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c | |||
@@ -1133,7 +1133,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
1133 | 1133 | ||
1134 | ndev->trans_start = jiffies; | 1134 | ndev->trans_start = jiffies; |
1135 | 1135 | ||
1136 | return 0; | 1136 | return NETDEV_TX_OK; |
1137 | } | 1137 | } |
1138 | 1138 | ||
1139 | /* device close function */ | 1139 | /* device close function */ |
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index a9a897bb42d5..61ceeaaf104d 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -1628,7 +1628,7 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev) | |||
1628 | "to slot %d.\n", | 1628 | "to slot %d.\n", |
1629 | net_dev->name, skb->data, (int)skb->len, entry); | 1629 | net_dev->name, skb->data, (int)skb->len, entry); |
1630 | 1630 | ||
1631 | return 0; | 1631 | return NETDEV_TX_OK; |
1632 | } | 1632 | } |
1633 | 1633 | ||
1634 | /** | 1634 | /** |
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 088fe26484e7..0c31272cf54d 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c | |||
@@ -1091,7 +1091,7 @@ static int skfp_send_pkt(struct sk_buff *skb, struct net_device *dev) | |||
1091 | netif_stop_queue(dev); | 1091 | netif_stop_queue(dev); |
1092 | } | 1092 | } |
1093 | dev->trans_start = jiffies; | 1093 | dev->trans_start = jiffies; |
1094 | return 0; | 1094 | return NETDEV_TX_OK; |
1095 | 1095 | ||
1096 | } // skfp_send_pkt | 1096 | } // skfp_send_pkt |
1097 | 1097 | ||
diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 5c61d5fad908..899c4a2112c9 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c | |||
@@ -484,12 +484,12 @@ sl_xmit(struct sk_buff *skb, struct net_device *dev) | |||
484 | spin_unlock(&sl->lock); | 484 | spin_unlock(&sl->lock); |
485 | printk(KERN_WARNING "%s: xmit call when iface is down\n", dev->name); | 485 | printk(KERN_WARNING "%s: xmit call when iface is down\n", dev->name); |
486 | dev_kfree_skb(skb); | 486 | dev_kfree_skb(skb); |
487 | return 0; | 487 | return NETDEV_TX_OK; |
488 | } | 488 | } |
489 | if (sl->tty == NULL) { | 489 | if (sl->tty == NULL) { |
490 | spin_unlock(&sl->lock); | 490 | spin_unlock(&sl->lock); |
491 | dev_kfree_skb(skb); | 491 | dev_kfree_skb(skb); |
492 | return 0; | 492 | return NETDEV_TX_OK; |
493 | } | 493 | } |
494 | 494 | ||
495 | sl_lock(sl); | 495 | sl_lock(sl); |
@@ -498,7 +498,7 @@ sl_xmit(struct sk_buff *skb, struct net_device *dev) | |||
498 | spin_unlock(&sl->lock); | 498 | spin_unlock(&sl->lock); |
499 | 499 | ||
500 | dev_kfree_skb(skb); | 500 | dev_kfree_skb(skb); |
501 | return 0; | 501 | return NETDEV_TX_OK; |
502 | } | 502 | } |
503 | 503 | ||
504 | 504 | ||
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index bc4976ac8712..2a6b6de95339 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c | |||
@@ -553,7 +553,7 @@ static int smc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
553 | dev->stats.tx_dropped++; | 553 | dev->stats.tx_dropped++; |
554 | spin_unlock_irqrestore(&lp->lock, flags); | 554 | spin_unlock_irqrestore(&lp->lock, flags); |
555 | dev_kfree_skb(skb); | 555 | dev_kfree_skb(skb); |
556 | return 0; | 556 | return NETDEV_TX_OK; |
557 | } | 557 | } |
558 | 558 | ||
559 | #ifdef SMC_USE_DMA | 559 | #ifdef SMC_USE_DMA |
@@ -566,7 +566,7 @@ static int smc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
566 | lp->pending_tx_skb = skb; | 566 | lp->pending_tx_skb = skb; |
567 | netif_stop_queue(dev); | 567 | netif_stop_queue(dev); |
568 | spin_unlock_irqrestore(&lp->lock, flags); | 568 | spin_unlock_irqrestore(&lp->lock, flags); |
569 | return 0; | 569 | return NETDEV_TX_OK; |
570 | } else { | 570 | } else { |
571 | DBG(SMC_DEBUG_TX | SMC_DEBUG_DMA, "%s: Activating Tx DMA\n", dev->name); | 571 | DBG(SMC_DEBUG_TX | SMC_DEBUG_DMA, "%s: Activating Tx DMA\n", dev->name); |
572 | lp->txdma_active = 1; | 572 | lp->txdma_active = 1; |
@@ -577,7 +577,7 @@ static int smc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
577 | smc911x_hardware_send_pkt(dev); | 577 | smc911x_hardware_send_pkt(dev); |
578 | spin_unlock_irqrestore(&lp->lock, flags); | 578 | spin_unlock_irqrestore(&lp->lock, flags); |
579 | 579 | ||
580 | return 0; | 580 | return NETDEV_TX_OK; |
581 | } | 581 | } |
582 | 582 | ||
583 | /* | 583 | /* |
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c index e02471b2f2b5..0a1b6f401087 100644 --- a/drivers/net/smc9194.c +++ b/drivers/net/smc9194.c | |||
@@ -512,7 +512,7 @@ static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device * de | |||
512 | if (length < ETH_ZLEN) { | 512 | if (length < ETH_ZLEN) { |
513 | if (skb_padto(skb, ETH_ZLEN)) { | 513 | if (skb_padto(skb, ETH_ZLEN)) { |
514 | netif_wake_queue(dev); | 514 | netif_wake_queue(dev); |
515 | return 0; | 515 | return NETDEV_TX_OK; |
516 | } | 516 | } |
517 | length = ETH_ZLEN; | 517 | length = ETH_ZLEN; |
518 | } | 518 | } |
@@ -534,7 +534,7 @@ static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device * de | |||
534 | lp->saved_skb = NULL; | 534 | lp->saved_skb = NULL; |
535 | /* this IS an error, but, i don't want the skb saved */ | 535 | /* this IS an error, but, i don't want the skb saved */ |
536 | netif_wake_queue(dev); | 536 | netif_wake_queue(dev); |
537 | return 0; | 537 | return NETDEV_TX_OK; |
538 | } | 538 | } |
539 | /* either way, a packet is waiting now */ | 539 | /* either way, a packet is waiting now */ |
540 | lp->packets_waiting++; | 540 | lp->packets_waiting++; |
@@ -571,12 +571,12 @@ static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device * de | |||
571 | SMC_ENABLE_INT( IM_ALLOC_INT ); | 571 | SMC_ENABLE_INT( IM_ALLOC_INT ); |
572 | PRINTK2((CARDNAME": memory allocation deferred. \n")); | 572 | PRINTK2((CARDNAME": memory allocation deferred. \n")); |
573 | /* it's deferred, but I'll handle it later */ | 573 | /* it's deferred, but I'll handle it later */ |
574 | return 0; | 574 | return NETDEV_TX_OK; |
575 | } | 575 | } |
576 | /* or YES! I can send the packet now.. */ | 576 | /* or YES! I can send the packet now.. */ |
577 | smc_hardware_send_packet(dev); | 577 | smc_hardware_send_packet(dev); |
578 | netif_wake_queue(dev); | 578 | netif_wake_queue(dev); |
579 | return 0; | 579 | return NETDEV_TX_OK; |
580 | } | 580 | } |
581 | 581 | ||
582 | /* | 582 | /* |
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index fdcbaf8dfa73..2968c75ff49b 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
@@ -655,7 +655,7 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
655 | dev->stats.tx_errors++; | 655 | dev->stats.tx_errors++; |
656 | dev->stats.tx_dropped++; | 656 | dev->stats.tx_dropped++; |
657 | dev_kfree_skb(skb); | 657 | dev_kfree_skb(skb); |
658 | return 0; | 658 | return NETDEV_TX_OK; |
659 | } | 659 | } |
660 | 660 | ||
661 | smc_special_lock(&lp->lock); | 661 | smc_special_lock(&lp->lock); |
@@ -692,7 +692,7 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
692 | smc_hardware_send_pkt((unsigned long)dev); | 692 | smc_hardware_send_pkt((unsigned long)dev); |
693 | } | 693 | } |
694 | 694 | ||
695 | return 0; | 695 | return NETDEV_TX_OK; |
696 | } | 696 | } |
697 | 697 | ||
698 | /* | 698 | /* |
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index 838cce8b8fff..1018349a29dc 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
@@ -1311,7 +1311,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev) | |||
1311 | 1311 | ||
1312 | dev->trans_start = jiffies; | 1312 | dev->trans_start = jiffies; |
1313 | 1313 | ||
1314 | return 0; | 1314 | return NETDEV_TX_OK; |
1315 | } | 1315 | } |
1316 | 1316 | ||
1317 | 1317 | ||
diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c index 7bb27426dbd6..2f1eaaf7a727 100644 --- a/drivers/net/sun3_82586.c +++ b/drivers/net/sun3_82586.c | |||
@@ -1015,7 +1015,7 @@ static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1015 | if(skb->len > XMIT_BUFF_SIZE) | 1015 | if(skb->len > XMIT_BUFF_SIZE) |
1016 | { | 1016 | { |
1017 | printk("%s: Sorry, max. framelength is %d bytes. The length of your frame is %d bytes.\n",dev->name,XMIT_BUFF_SIZE,skb->len); | 1017 | printk("%s: Sorry, max. framelength is %d bytes. The length of your frame is %d bytes.\n",dev->name,XMIT_BUFF_SIZE,skb->len); |
1018 | return 0; | 1018 | return NETDEV_TX_OK; |
1019 | } | 1019 | } |
1020 | 1020 | ||
1021 | netif_stop_queue(dev); | 1021 | netif_stop_queue(dev); |
@@ -1110,7 +1110,7 @@ static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1110 | dev_kfree_skb(skb); | 1110 | dev_kfree_skb(skb); |
1111 | #endif | 1111 | #endif |
1112 | } | 1112 | } |
1113 | return 0; | 1113 | return NETDEV_TX_OK; |
1114 | } | 1114 | } |
1115 | 1115 | ||
1116 | /******************************************* | 1116 | /******************************************* |
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index 534dfe3eef6f..0ca4241b4f63 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c | |||
@@ -562,7 +562,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) | |||
562 | netif_start_queue(dev); | 562 | netif_start_queue(dev); |
563 | dev->trans_start = jiffies; | 563 | dev->trans_start = jiffies; |
564 | 564 | ||
565 | return 0; | 565 | return NETDEV_TX_OK; |
566 | } | 566 | } |
567 | 567 | ||
568 | 568 | ||
@@ -648,7 +648,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) | |||
648 | 648 | ||
649 | local_irq_restore(flags); | 649 | local_irq_restore(flags); |
650 | 650 | ||
651 | return 0; | 651 | return NETDEV_TX_OK; |
652 | } | 652 | } |
653 | 653 | ||
654 | /* The LANCE interrupt handler. */ | 654 | /* The LANCE interrupt handler. */ |
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index 5017d7fcb40c..536cf7e06bfd 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
@@ -984,7 +984,7 @@ static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
984 | 984 | ||
985 | dev->trans_start = jiffies; | 985 | dev->trans_start = jiffies; |
986 | 986 | ||
987 | return 0; | 987 | return NETDEV_TX_OK; |
988 | } | 988 | } |
989 | 989 | ||
990 | static struct net_device_stats *bigmac_get_stats(struct net_device *dev) | 990 | static struct net_device_stats *bigmac_get_stats(struct net_device *dev) |
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index 545f81b34ad7..0df6332ed9ce 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c | |||
@@ -1091,7 +1091,7 @@ start_tx (struct sk_buff *skb, struct net_device *dev) | |||
1091 | "%s: Transmit frame #%d queued in slot %d.\n", | 1091 | "%s: Transmit frame #%d queued in slot %d.\n", |
1092 | dev->name, np->cur_tx, entry); | 1092 | dev->name, np->cur_tx, entry); |
1093 | } | 1093 | } |
1094 | return 0; | 1094 | return NETDEV_TX_OK; |
1095 | } | 1095 | } |
1096 | 1096 | ||
1097 | /* Reset hardware tx and free all of tx buffers */ | 1097 | /* Reset hardware tx and free all of tx buffers */ |
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 4ef729198e10..008bd59fc64b 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
@@ -2338,7 +2338,7 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2338 | dev->trans_start = jiffies; | 2338 | dev->trans_start = jiffies; |
2339 | 2339 | ||
2340 | tx_add_log(hp, TXLOG_ACTION_TXMIT, 0); | 2340 | tx_add_log(hp, TXLOG_ACTION_TXMIT, 0); |
2341 | return 0; | 2341 | return NETDEV_TX_OK; |
2342 | } | 2342 | } |
2343 | 2343 | ||
2344 | static struct net_device_stats *happy_meal_get_stats(struct net_device *dev) | 2344 | static struct net_device_stats *happy_meal_get_stats(struct net_device *dev) |
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index afc7b351e5ec..9d6fd4760eab 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
@@ -1163,7 +1163,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1163 | dev->trans_start = jiffies; | 1163 | dev->trans_start = jiffies; |
1164 | dev_kfree_skb(skb); | 1164 | dev_kfree_skb(skb); |
1165 | 1165 | ||
1166 | return 0; | 1166 | return NETDEV_TX_OK; |
1167 | } | 1167 | } |
1168 | 1168 | ||
1169 | /* taken from the depca driver */ | 1169 | /* taken from the depca driver */ |
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c index c6ec61e0accf..dcefb608a9f4 100644 --- a/drivers/net/sunqe.c +++ b/drivers/net/sunqe.c | |||
@@ -621,7 +621,7 @@ static int qe_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
621 | 621 | ||
622 | dev_kfree_skb(skb); | 622 | dev_kfree_skb(skb); |
623 | 623 | ||
624 | return 0; | 624 | return NETDEV_TX_OK; |
625 | } | 625 | } |
626 | 626 | ||
627 | static void qe_set_multicast(struct net_device *dev) | 627 | static void qe_set_multicast(struct net_device *dev) |
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index d737f6b8f876..1ce2da172ca9 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
@@ -1509,7 +1509,7 @@ static int tc35815_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1509 | */ | 1509 | */ |
1510 | 1510 | ||
1511 | spin_unlock_irqrestore(&lp->lock, flags); | 1511 | spin_unlock_irqrestore(&lp->lock, flags); |
1512 | return 0; | 1512 | return NETDEV_TX_OK; |
1513 | } | 1513 | } |
1514 | 1514 | ||
1515 | #define FATAL_ERROR_INT \ | 1515 | #define FATAL_ERROR_INT \ |
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index 384cb5e28397..70c9ec45d8fb 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c | |||
@@ -1095,11 +1095,11 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev ) | |||
1095 | TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT: %s PHY is not ready\n", | 1095 | TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT: %s PHY is not ready\n", |
1096 | dev->name ); | 1096 | dev->name ); |
1097 | dev_kfree_skb_any(skb); | 1097 | dev_kfree_skb_any(skb); |
1098 | return 0; | 1098 | return NETDEV_TX_OK; |
1099 | } | 1099 | } |
1100 | 1100 | ||
1101 | if (skb_padto(skb, TLAN_MIN_FRAME_SIZE)) | 1101 | if (skb_padto(skb, TLAN_MIN_FRAME_SIZE)) |
1102 | return 0; | 1102 | return NETDEV_TX_OK; |
1103 | txlen = max(skb->len, (unsigned int)TLAN_MIN_FRAME_SIZE); | 1103 | txlen = max(skb->len, (unsigned int)TLAN_MIN_FRAME_SIZE); |
1104 | 1104 | ||
1105 | tail_list = priv->txList + priv->txTail; | 1105 | tail_list = priv->txList + priv->txTail; |
@@ -1150,7 +1150,7 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev ) | |||
1150 | CIRC_INC( priv->txTail, TLAN_NUM_TX_LISTS ); | 1150 | CIRC_INC( priv->txTail, TLAN_NUM_TX_LISTS ); |
1151 | 1151 | ||
1152 | dev->trans_start = jiffies; | 1152 | dev->trans_start = jiffies; |
1153 | return 0; | 1153 | return NETDEV_TX_OK; |
1154 | 1154 | ||
1155 | } /* TLan_StartTx */ | 1155 | } /* TLan_StartTx */ |
1156 | 1156 | ||
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index b40b6de2d086..1787d52941bc 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c | |||
@@ -1240,7 +1240,7 @@ static int xl_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1240 | 1240 | ||
1241 | spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ; | 1241 | spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ; |
1242 | 1242 | ||
1243 | return 0; | 1243 | return NETDEV_TX_OK; |
1244 | } else { | 1244 | } else { |
1245 | spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ; | 1245 | spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ; |
1246 | return NETDEV_TX_BUSY; | 1246 | return NETDEV_TX_BUSY; |
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 9d896116cf76..6472ba5cfc5e 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
@@ -1041,7 +1041,7 @@ static int tok_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1041 | writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD); | 1041 | writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD); |
1042 | spin_unlock_irqrestore(&(ti->lock), flags); | 1042 | spin_unlock_irqrestore(&(ti->lock), flags); |
1043 | dev->trans_start = jiffies; | 1043 | dev->trans_start = jiffies; |
1044 | return 0; | 1044 | return NETDEV_TX_OK; |
1045 | } | 1045 | } |
1046 | 1046 | ||
1047 | /*****************************************************************************/ | 1047 | /*****************************************************************************/ |
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index b3715efdce56..d07e61a9499e 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -1183,7 +1183,7 @@ static int streamer_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1183 | 1183 | ||
1184 | streamer_priv->tx_ring_free = (streamer_priv->tx_ring_free + 1) & (STREAMER_TX_RING_SIZE - 1); | 1184 | streamer_priv->tx_ring_free = (streamer_priv->tx_ring_free + 1) & (STREAMER_TX_RING_SIZE - 1); |
1185 | spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags); | 1185 | spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags); |
1186 | return 0; | 1186 | return NETDEV_TX_OK; |
1187 | } else { | 1187 | } else { |
1188 | netif_stop_queue(dev); | 1188 | netif_stop_queue(dev); |
1189 | spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags); | 1189 | spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags); |
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index 451b54136ede..f73f4e684f33 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c | |||
@@ -1052,7 +1052,7 @@ static int olympic_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1052 | writew((((readw(olympic_mmio+TXENQ_1)) & 0x8000) ^ 0x8000) | 1,olympic_mmio+TXENQ_1); | 1052 | writew((((readw(olympic_mmio+TXENQ_1)) & 0x8000) ^ 0x8000) | 1,olympic_mmio+TXENQ_1); |
1053 | netif_wake_queue(dev); | 1053 | netif_wake_queue(dev); |
1054 | spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags); | 1054 | spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags); |
1055 | return 0; | 1055 | return NETDEV_TX_OK; |
1056 | } else { | 1056 | } else { |
1057 | spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags); | 1057 | spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags); |
1058 | return NETDEV_TX_BUSY; | 1058 | return NETDEV_TX_BUSY; |
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 | ||
696 | static void tulip_clean_tx_ring(struct tulip_private *tp) | 696 | static 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 | ||
1064 | static void netdev_tx_done(struct net_device *dev) | 1064 | static 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 | ||
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index b393536012fb..c3927b423743 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
@@ -398,12 +398,12 @@ static int tun_net_xmit(struct sk_buff *skb, struct net_device *dev) | |||
398 | if (tun->flags & TUN_FASYNC) | 398 | if (tun->flags & TUN_FASYNC) |
399 | kill_fasync(&tun->fasync, SIGIO, POLL_IN); | 399 | kill_fasync(&tun->fasync, SIGIO, POLL_IN); |
400 | wake_up_interruptible(&tun->socket.wait); | 400 | wake_up_interruptible(&tun->socket.wait); |
401 | return 0; | 401 | return NETDEV_TX_OK; |
402 | 402 | ||
403 | drop: | 403 | drop: |
404 | dev->stats.tx_dropped++; | 404 | dev->stats.tx_dropped++; |
405 | kfree_skb(skb); | 405 | kfree_skb(skb); |
406 | return 0; | 406 | return NETDEV_TX_OK; |
407 | } | 407 | } |
408 | 408 | ||
409 | static void tun_net_mclist(struct net_device *dev) | 409 | static void tun_net_mclist(struct net_device *dev) |
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index cf25eb41b1ce..2c26b4577e8a 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
@@ -909,7 +909,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev) | |||
909 | netif_wake_queue(dev); | 909 | netif_wake_queue(dev); |
910 | } | 910 | } |
911 | 911 | ||
912 | return 0; | 912 | return NETDEV_TX_OK; |
913 | } | 913 | } |
914 | 914 | ||
915 | static void | 915 | static void |
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 40c6eba775ce..5ba95867a2be 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -3173,7 +3173,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
3173 | #endif | 3173 | #endif |
3174 | spin_unlock_irq(&ugeth->lock); | 3174 | spin_unlock_irq(&ugeth->lock); |
3175 | 3175 | ||
3176 | return 0; | 3176 | return NETDEV_TX_OK; |
3177 | } | 3177 | } |
3178 | 3178 | ||
3179 | static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit) | 3179 | static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit) |
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c index b9dd42574288..7abdc4abbe07 100644 --- a/drivers/net/usb/catc.c +++ b/drivers/net/usb/catc.c | |||
@@ -448,7 +448,7 @@ static int catc_start_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
448 | 448 | ||
449 | dev_kfree_skb(skb); | 449 | dev_kfree_skb(skb); |
450 | 450 | ||
451 | return 0; | 451 | return NETDEV_TX_OK; |
452 | } | 452 | } |
453 | 453 | ||
454 | static void catc_tx_timeout(struct net_device *netdev) | 454 | static void catc_tx_timeout(struct net_device *netdev) |
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index f8c6d7ea7264..ffe410635735 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c | |||
@@ -780,7 +780,7 @@ static int hso_net_start_xmit(struct sk_buff *skb, struct net_device *net) | |||
780 | netif_stop_queue(net); | 780 | netif_stop_queue(net); |
781 | if (hso_get_activity(odev->parent) == -EAGAIN) { | 781 | if (hso_get_activity(odev->parent) == -EAGAIN) { |
782 | odev->skb_tx_buf = skb; | 782 | odev->skb_tx_buf = skb; |
783 | return 0; | 783 | return NETDEV_TX_OK; |
784 | } | 784 | } |
785 | 785 | ||
786 | /* log if asked */ | 786 | /* log if asked */ |
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index e01314789718..09a5bd381566 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c | |||
@@ -829,7 +829,7 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net) | |||
829 | kaweth->stats.tx_errors++; | 829 | kaweth->stats.tx_errors++; |
830 | netif_start_queue(net); | 830 | netif_start_queue(net); |
831 | spin_unlock_irq(&kaweth->device_lock); | 831 | spin_unlock_irq(&kaweth->device_lock); |
832 | return 0; | 832 | return NETDEV_TX_OK; |
833 | } | 833 | } |
834 | } | 834 | } |
835 | 835 | ||
@@ -864,7 +864,7 @@ skip: | |||
864 | 864 | ||
865 | spin_unlock_irq(&kaweth->device_lock); | 865 | spin_unlock_irq(&kaweth->device_lock); |
866 | 866 | ||
867 | return 0; | 867 | return NETDEV_TX_OK; |
868 | } | 868 | } |
869 | 869 | ||
870 | /**************************************************************** | 870 | /**************************************************************** |
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 73acbd244aa1..632d1aeda570 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
@@ -914,7 +914,7 @@ static int pegasus_start_xmit(struct sk_buff *skb, struct net_device *net) | |||
914 | } | 914 | } |
915 | dev_kfree_skb(skb); | 915 | dev_kfree_skb(skb); |
916 | 916 | ||
917 | return 0; | 917 | return NETDEV_TX_OK; |
918 | } | 918 | } |
919 | 919 | ||
920 | static struct net_device_stats *pegasus_netdev_stats(struct net_device *dev) | 920 | static struct net_device_stats *pegasus_netdev_stats(struct net_device *dev) |
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index fcc6fa0905d1..bac8b77fb25e 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c | |||
@@ -753,7 +753,7 @@ static int rtl8150_start_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
753 | netdev->trans_start = jiffies; | 753 | netdev->trans_start = jiffies; |
754 | } | 754 | } |
755 | 755 | ||
756 | return 0; | 756 | return NETDEV_TX_OK; |
757 | } | 757 | } |
758 | 758 | ||
759 | 759 | ||
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 1097c72e44d5..f1d753daa5bd 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c | |||
@@ -189,17 +189,17 @@ static int veth_xmit(struct sk_buff *skb, struct net_device *dev) | |||
189 | rcv_stats->rx_packets++; | 189 | rcv_stats->rx_packets++; |
190 | 190 | ||
191 | netif_rx(skb); | 191 | netif_rx(skb); |
192 | return 0; | 192 | return NETDEV_TX_OK; |
193 | 193 | ||
194 | tx_drop: | 194 | tx_drop: |
195 | kfree_skb(skb); | 195 | kfree_skb(skb); |
196 | stats->tx_dropped++; | 196 | stats->tx_dropped++; |
197 | return 0; | 197 | return NETDEV_TX_OK; |
198 | 198 | ||
199 | rx_drop: | 199 | rx_drop: |
200 | kfree_skb(skb); | 200 | kfree_skb(skb); |
201 | rcv_stats->rx_dropped++; | 201 | rcv_stats->rx_dropped++; |
202 | return 0; | 202 | return NETDEV_TX_OK; |
203 | } | 203 | } |
204 | 204 | ||
205 | /* | 205 | /* |
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index d3489a3c4c03..715220158311 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
@@ -1225,7 +1225,7 @@ static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev) | |||
1225 | entry = rp->cur_tx % TX_RING_SIZE; | 1225 | entry = rp->cur_tx % TX_RING_SIZE; |
1226 | 1226 | ||
1227 | if (skb_padto(skb, ETH_ZLEN)) | 1227 | if (skb_padto(skb, ETH_ZLEN)) |
1228 | return 0; | 1228 | return NETDEV_TX_OK; |
1229 | 1229 | ||
1230 | rp->tx_skbuff[entry] = skb; | 1230 | rp->tx_skbuff[entry] = skb; |
1231 | 1231 | ||
@@ -1237,7 +1237,7 @@ static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev) | |||
1237 | dev_kfree_skb(skb); | 1237 | dev_kfree_skb(skb); |
1238 | rp->tx_skbuff[entry] = NULL; | 1238 | rp->tx_skbuff[entry] = NULL; |
1239 | dev->stats.tx_dropped++; | 1239 | dev->stats.tx_dropped++; |
1240 | return 0; | 1240 | return NETDEV_TX_OK; |
1241 | } | 1241 | } |
1242 | 1242 | ||
1243 | /* Padding is not copied and so must be redone. */ | 1243 | /* Padding is not copied and so must be redone. */ |
@@ -1285,7 +1285,7 @@ static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev) | |||
1285 | printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n", | 1285 | printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n", |
1286 | dev->name, rp->cur_tx-1, entry); | 1286 | dev->name, rp->cur_tx-1, entry); |
1287 | } | 1287 | } |
1288 | return 0; | 1288 | return NETDEV_TX_OK; |
1289 | } | 1289 | } |
1290 | 1290 | ||
1291 | /* The interrupt handler does all of the Rx thread work and cleans up | 1291 | /* The interrupt handler does all of the Rx thread work and cleans up |
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 3ba35956327a..42365e5f931b 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
@@ -2098,7 +2098,7 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2098 | #ifdef VELOCITY_ZERO_COPY_SUPPORT | 2098 | #ifdef VELOCITY_ZERO_COPY_SUPPORT |
2099 | if (skb_shinfo(skb)->nr_frags > 6 && __skb_linearize(skb)) { | 2099 | if (skb_shinfo(skb)->nr_frags > 6 && __skb_linearize(skb)) { |
2100 | kfree_skb(skb); | 2100 | kfree_skb(skb); |
2101 | return 0; | 2101 | return NETDEV_TX_OK; |
2102 | } | 2102 | } |
2103 | #endif | 2103 | #endif |
2104 | 2104 | ||
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c index 6034497536a4..fd0ebf78bead 100644 --- a/drivers/net/vxge/vxge-main.c +++ b/drivers/net/vxge/vxge-main.c | |||
@@ -1000,7 +1000,7 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1000 | VXGE_COMPLETE_VPATH_TX(fifo); | 1000 | VXGE_COMPLETE_VPATH_TX(fifo); |
1001 | vxge_debug_entryexit(VXGE_TRACE, "%s: %s:%d Exiting...", | 1001 | vxge_debug_entryexit(VXGE_TRACE, "%s: %s:%d Exiting...", |
1002 | dev->name, __func__, __LINE__); | 1002 | dev->name, __func__, __LINE__); |
1003 | return 0; | 1003 | return NETDEV_TX_OK; |
1004 | 1004 | ||
1005 | _exit0: | 1005 | _exit0: |
1006 | vxge_debug_tx(VXGE_TRACE, "%s: pci_map_page failed", dev->name); | 1006 | vxge_debug_tx(VXGE_TRACE, "%s: pci_map_page failed", dev->name); |
@@ -1024,7 +1024,7 @@ _exit2: | |||
1024 | spin_unlock_irqrestore(&fifo->tx_lock, flags); | 1024 | spin_unlock_irqrestore(&fifo->tx_lock, flags); |
1025 | VXGE_COMPLETE_VPATH_TX(fifo); | 1025 | VXGE_COMPLETE_VPATH_TX(fifo); |
1026 | 1026 | ||
1027 | return 0; | 1027 | return NETDEV_TX_OK; |
1028 | } | 1028 | } |
1029 | 1029 | ||
1030 | /* | 1030 | /* |
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c index f525f9fe74db..4ae9bd297cc2 100644 --- a/drivers/net/wan/cycx_x25.c +++ b/drivers/net/wan/cycx_x25.c | |||
@@ -663,7 +663,7 @@ static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb, | |||
663 | free_packet: | 663 | free_packet: |
664 | dev_kfree_skb(skb); | 664 | dev_kfree_skb(skb); |
665 | 665 | ||
666 | return 0; | 666 | return NETDEV_TX_OK; |
667 | } | 667 | } |
668 | 668 | ||
669 | /* Get Ethernet-style interface statistics. | 669 | /* Get Ethernet-style interface statistics. |
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index bfa0161a02d3..52438c76bf8a 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c | |||
@@ -421,7 +421,7 @@ static int pvc_xmit(struct sk_buff *skb, struct net_device *dev) | |||
421 | GFP_ATOMIC)) { | 421 | GFP_ATOMIC)) { |
422 | dev->stats.tx_dropped++; | 422 | dev->stats.tx_dropped++; |
423 | dev_kfree_skb(skb); | 423 | dev_kfree_skb(skb); |
424 | return 0; | 424 | return NETDEV_TX_OK; |
425 | } | 425 | } |
426 | skb_put(skb, pad); | 426 | skb_put(skb, pad); |
427 | memset(skb->data + len, 0, pad); | 427 | memset(skb->data + len, 0, pad); |
@@ -435,13 +435,13 @@ static int pvc_xmit(struct sk_buff *skb, struct net_device *dev) | |||
435 | dev->stats.tx_compressed++; | 435 | dev->stats.tx_compressed++; |
436 | skb->dev = pvc->frad; | 436 | skb->dev = pvc->frad; |
437 | dev_queue_xmit(skb); | 437 | dev_queue_xmit(skb); |
438 | return 0; | 438 | return NETDEV_TX_OK; |
439 | } | 439 | } |
440 | } | 440 | } |
441 | 441 | ||
442 | dev->stats.tx_dropped++; | 442 | dev->stats.tx_dropped++; |
443 | dev_kfree_skb(skb); | 443 | dev_kfree_skb(skb); |
444 | return 0; | 444 | return NETDEV_TX_OK; |
445 | } | 445 | } |
446 | 446 | ||
447 | static inline void fr_log_dlci_active(pvc_device *pvc) | 447 | static inline void fr_log_dlci_active(pvc_device *pvc) |
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index 3fb9dbc88a1a..545178e6765d 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
@@ -465,7 +465,7 @@ sbni_start_xmit( struct sk_buff *skb, struct net_device *dev ) | |||
465 | prepare_to_send( skb, p ); | 465 | prepare_to_send( skb, p ); |
466 | spin_unlock( &nl->lock ); | 466 | spin_unlock( &nl->lock ); |
467 | netif_start_queue( dev ); | 467 | netif_start_queue( dev ); |
468 | return 0; | 468 | return NETDEV_TX_OK; |
469 | } | 469 | } |
470 | } | 470 | } |
471 | 471 | ||
@@ -485,7 +485,7 @@ sbni_start_xmit( struct sk_buff *skb, struct net_device *dev ) | |||
485 | prepare_to_send( skb, dev ); | 485 | prepare_to_send( skb, dev ); |
486 | 486 | ||
487 | spin_unlock( &nl->lock ); | 487 | spin_unlock( &nl->lock ); |
488 | return 0; | 488 | return NETDEV_TX_OK; |
489 | } | 489 | } |
490 | 490 | ||
491 | #endif /* CONFIG_SBNI_MULTILINE */ | 491 | #endif /* CONFIG_SBNI_MULTILINE */ |
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index d67e208ab375..1047920e742c 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c | |||
@@ -308,7 +308,7 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev) | |||
308 | printk(KERN_ERR "%s: xmit call when iface is down\n", | 308 | printk(KERN_ERR "%s: xmit call when iface is down\n", |
309 | dev->name); | 309 | dev->name); |
310 | kfree_skb(skb); | 310 | kfree_skb(skb); |
311 | return 0; | 311 | return NETDEV_TX_OK; |
312 | } | 312 | } |
313 | 313 | ||
314 | switch (skb->data[0]) { | 314 | switch (skb->data[0]) { |
@@ -319,14 +319,14 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev) | |||
319 | if (err != LAPB_OK) | 319 | if (err != LAPB_OK) |
320 | printk(KERN_ERR "x25_asy: lapb_connect_request error - %d\n", err); | 320 | printk(KERN_ERR "x25_asy: lapb_connect_request error - %d\n", err); |
321 | kfree_skb(skb); | 321 | kfree_skb(skb); |
322 | return 0; | 322 | return NETDEV_TX_OK; |
323 | case 0x02: /* Disconnect request .. do nothing - hang up ?? */ | 323 | case 0x02: /* Disconnect request .. do nothing - hang up ?? */ |
324 | err = lapb_disconnect_request(dev); | 324 | err = lapb_disconnect_request(dev); |
325 | if (err != LAPB_OK) | 325 | if (err != LAPB_OK) |
326 | printk(KERN_ERR "x25_asy: lapb_disconnect_request error - %d\n", err); | 326 | printk(KERN_ERR "x25_asy: lapb_disconnect_request error - %d\n", err); |
327 | default: | 327 | default: |
328 | kfree_skb(skb); | 328 | kfree_skb(skb); |
329 | return 0; | 329 | return NETDEV_TX_OK; |
330 | } | 330 | } |
331 | skb_pull(skb, 1); /* Remove control byte */ | 331 | skb_pull(skb, 1); /* Remove control byte */ |
332 | /* | 332 | /* |
@@ -344,9 +344,9 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev) | |||
344 | if (err != LAPB_OK) { | 344 | if (err != LAPB_OK) { |
345 | printk(KERN_ERR "x25_asy: lapb_data_request error - %d\n", err); | 345 | printk(KERN_ERR "x25_asy: lapb_data_request error - %d\n", err); |
346 | kfree_skb(skb); | 346 | kfree_skb(skb); |
347 | return 0; | 347 | return NETDEV_TX_OK; |
348 | } | 348 | } |
349 | return 0; | 349 | return NETDEV_TX_OK; |
350 | } | 350 | } |
351 | 351 | ||
352 | 352 | ||
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index c70604f0329e..49f3139a3fe7 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -1927,7 +1927,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) { | |||
1927 | 1927 | ||
1928 | if (!skb) { | 1928 | if (!skb) { |
1929 | airo_print_err(dev->name, "%s: skb == NULL!",__func__); | 1929 | airo_print_err(dev->name, "%s: skb == NULL!",__func__); |
1930 | return 0; | 1930 | return NETDEV_TX_OK; |
1931 | } | 1931 | } |
1932 | npacks = skb_queue_len (&ai->txq); | 1932 | npacks = skb_queue_len (&ai->txq); |
1933 | 1933 | ||
@@ -1938,7 +1938,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) { | |||
1938 | return NETDEV_TX_BUSY; | 1938 | return NETDEV_TX_BUSY; |
1939 | } | 1939 | } |
1940 | skb_queue_tail (&ai->txq, skb); | 1940 | skb_queue_tail (&ai->txq, skb); |
1941 | return 0; | 1941 | return NETDEV_TX_OK; |
1942 | } | 1942 | } |
1943 | 1943 | ||
1944 | spin_lock_irqsave(&ai->aux_lock, flags); | 1944 | spin_lock_irqsave(&ai->aux_lock, flags); |
@@ -1951,7 +1951,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) { | |||
1951 | set_bit(FLAG_PENDING_XMIT, &ai->flags); | 1951 | set_bit(FLAG_PENDING_XMIT, &ai->flags); |
1952 | mpi_send_packet (dev); | 1952 | mpi_send_packet (dev); |
1953 | } | 1953 | } |
1954 | return 0; | 1954 | return NETDEV_TX_OK; |
1955 | } | 1955 | } |
1956 | 1956 | ||
1957 | /* | 1957 | /* |
@@ -2127,7 +2127,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) { | |||
2127 | 2127 | ||
2128 | if ( skb == NULL ) { | 2128 | if ( skb == NULL ) { |
2129 | airo_print_err(dev->name, "%s: skb == NULL!", __func__); | 2129 | airo_print_err(dev->name, "%s: skb == NULL!", __func__); |
2130 | return 0; | 2130 | return NETDEV_TX_OK; |
2131 | } | 2131 | } |
2132 | 2132 | ||
2133 | /* Find a vacant FID */ | 2133 | /* Find a vacant FID */ |
@@ -2155,7 +2155,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) { | |||
2155 | wake_up_interruptible(&priv->thr_wait); | 2155 | wake_up_interruptible(&priv->thr_wait); |
2156 | } else | 2156 | } else |
2157 | airo_end_xmit(dev); | 2157 | airo_end_xmit(dev); |
2158 | return 0; | 2158 | return NETDEV_TX_OK; |
2159 | } | 2159 | } |
2160 | 2160 | ||
2161 | static void airo_end_xmit11(struct net_device *dev) { | 2161 | static void airo_end_xmit11(struct net_device *dev) { |
@@ -2199,7 +2199,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) { | |||
2199 | 2199 | ||
2200 | if ( skb == NULL ) { | 2200 | if ( skb == NULL ) { |
2201 | airo_print_err(dev->name, "%s: skb == NULL!", __func__); | 2201 | airo_print_err(dev->name, "%s: skb == NULL!", __func__); |
2202 | return 0; | 2202 | return NETDEV_TX_OK; |
2203 | } | 2203 | } |
2204 | 2204 | ||
2205 | /* Find a vacant FID */ | 2205 | /* Find a vacant FID */ |
@@ -2227,7 +2227,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) { | |||
2227 | wake_up_interruptible(&priv->thr_wait); | 2227 | wake_up_interruptible(&priv->thr_wait); |
2228 | } else | 2228 | } else |
2229 | airo_end_xmit11(dev); | 2229 | airo_end_xmit11(dev); |
2230 | return 0; | 2230 | return NETDEV_TX_OK; |
2231 | } | 2231 | } |
2232 | 2232 | ||
2233 | static void airo_read_stats(struct net_device *dev) | 2233 | static void airo_read_stats(struct net_device *dev) |
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c index d84caf198a23..d479f4735aaa 100644 --- a/drivers/net/wireless/arlan-main.c +++ b/drivers/net/wireless/arlan-main.c | |||
@@ -1193,7 +1193,7 @@ static int arlan_tx(struct sk_buff *skb, struct net_device *dev) | |||
1193 | 1193 | ||
1194 | arlan_process_interrupt(dev); | 1194 | arlan_process_interrupt(dev); |
1195 | ARLAN_DEBUG_EXIT("arlan_tx"); | 1195 | ARLAN_DEBUG_EXIT("arlan_tx"); |
1196 | return 0; | 1196 | return NETDEV_TX_OK; |
1197 | 1197 | ||
1198 | bad_end: | 1198 | bad_end: |
1199 | arlan_process_interrupt(dev); | 1199 | arlan_process_interrupt(dev); |
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 291a94bd46fd..05813bc3e308 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
@@ -793,13 +793,13 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev) | |||
793 | !(*priv->present_callback)(priv->card)) { | 793 | !(*priv->present_callback)(priv->card)) { |
794 | dev->stats.tx_errors++; | 794 | dev->stats.tx_errors++; |
795 | dev_kfree_skb(skb); | 795 | dev_kfree_skb(skb); |
796 | return 0; | 796 | return NETDEV_TX_OK; |
797 | } | 797 | } |
798 | 798 | ||
799 | if (priv->station_state != STATION_STATE_READY) { | 799 | if (priv->station_state != STATION_STATE_READY) { |
800 | dev->stats.tx_errors++; | 800 | dev->stats.tx_errors++; |
801 | dev_kfree_skb(skb); | 801 | dev_kfree_skb(skb); |
802 | return 0; | 802 | return NETDEV_TX_OK; |
803 | } | 803 | } |
804 | 804 | ||
805 | /* first ensure the timer func cannot run */ | 805 | /* first ensure the timer func cannot run */ |
@@ -856,7 +856,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev) | |||
856 | spin_unlock_bh(&priv->timerlock); | 856 | spin_unlock_bh(&priv->timerlock); |
857 | dev_kfree_skb(skb); | 857 | dev_kfree_skb(skb); |
858 | 858 | ||
859 | return 0; | 859 | return NETDEV_TX_OK; |
860 | } | 860 | } |
861 | 861 | ||
862 | static void atmel_transmit_management_frame(struct atmel_private *priv, | 862 | static void atmel_transmit_management_frame(struct atmel_private *priv, |
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index e789c6e9938c..55f77ad85304 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c | |||
@@ -314,7 +314,7 @@ static int hwsim_mon_xmit(struct sk_buff *skb, struct net_device *dev) | |||
314 | { | 314 | { |
315 | /* TODO: allow packet injection */ | 315 | /* TODO: allow packet injection */ |
316 | dev_kfree_skb(skb); | 316 | dev_kfree_skb(skb); |
317 | return 0; | 317 | return NETDEV_TX_OK; |
318 | } | 318 | } |
319 | 319 | ||
320 | 320 | ||
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index d63c8992f229..712f26eef35d 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
@@ -1047,7 +1047,7 @@ static int netwave_start_xmit(struct sk_buff *skb, struct net_device *dev) { | |||
1047 | } | 1047 | } |
1048 | dev_kfree_skb(skb); | 1048 | dev_kfree_skb(skb); |
1049 | 1049 | ||
1050 | return 0; | 1050 | return NETDEV_TX_OK; |
1051 | } /* netwave_start_xmit */ | 1051 | } /* netwave_start_xmit */ |
1052 | 1052 | ||
1053 | /* | 1053 | /* |
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index b10b0383dfa5..64e574c3655c 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -937,7 +937,7 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
937 | 937 | ||
938 | if (length < ETH_ZLEN) { | 938 | if (length < ETH_ZLEN) { |
939 | if (skb_padto(skb, ETH_ZLEN)) | 939 | if (skb_padto(skb, ETH_ZLEN)) |
940 | return 0; | 940 | return NETDEV_TX_OK; |
941 | length = ETH_ZLEN; | 941 | length = ETH_ZLEN; |
942 | } | 942 | } |
943 | switch (ray_hw_xmit(skb->data, length, dev, DATA_TYPE)) { | 943 | switch (ray_hw_xmit(skb->data, length, dev, DATA_TYPE)) { |
@@ -951,9 +951,9 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
951 | default: | 951 | default: |
952 | dev->trans_start = jiffies; | 952 | dev->trans_start = jiffies; |
953 | dev_kfree_skb(skb); | 953 | dev_kfree_skb(skb); |
954 | return 0; | 954 | return NETDEV_TX_OK; |
955 | } | 955 | } |
956 | return 0; | 956 | return NETDEV_TX_OK; |
957 | } /* ray_dev_start_xmit */ | 957 | } /* ray_dev_start_xmit */ |
958 | 958 | ||
959 | /*===========================================================================*/ | 959 | /*===========================================================================*/ |
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index 38366a56b71f..73300c226f67 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c | |||
@@ -1582,7 +1582,7 @@ static int strip_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1582 | 1582 | ||
1583 | if (skb) | 1583 | if (skb) |
1584 | dev_kfree_skb(skb); | 1584 | dev_kfree_skb(skb); |
1585 | return 0; | 1585 | return NETDEV_TX_OK; |
1586 | } | 1586 | } |
1587 | 1587 | ||
1588 | /* | 1588 | /* |
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index 4430b8d92e21..dae1bfb7655e 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c | |||
@@ -789,7 +789,7 @@ static int zd1201_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
789 | if (!zd->mac_enabled || zd->monitor) { | 789 | if (!zd->mac_enabled || zd->monitor) { |
790 | dev->stats.tx_dropped++; | 790 | dev->stats.tx_dropped++; |
791 | kfree_skb(skb); | 791 | kfree_skb(skb); |
792 | return 0; | 792 | return NETDEV_TX_OK; |
793 | } | 793 | } |
794 | netif_stop_queue(dev); | 794 | netif_stop_queue(dev); |
795 | 795 | ||
@@ -826,7 +826,7 @@ static int zd1201_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
826 | } | 826 | } |
827 | kfree_skb(skb); | 827 | kfree_skb(skb); |
828 | 828 | ||
829 | return 0; | 829 | return NETDEV_TX_OK; |
830 | } | 830 | } |
831 | 831 | ||
832 | static void zd1201_tx_timeout(struct net_device *dev) | 832 | static void zd1201_tx_timeout(struct net_device *dev) |
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 8d88daeed0c6..3700c49d76ca 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
@@ -558,12 +558,12 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
558 | 558 | ||
559 | spin_unlock_irq(&np->tx_lock); | 559 | spin_unlock_irq(&np->tx_lock); |
560 | 560 | ||
561 | return 0; | 561 | return NETDEV_TX_OK; |
562 | 562 | ||
563 | drop: | 563 | drop: |
564 | dev->stats.tx_dropped++; | 564 | dev->stats.tx_dropped++; |
565 | dev_kfree_skb(skb); | 565 | dev_kfree_skb(skb); |
566 | return 0; | 566 | return NETDEV_TX_OK; |
567 | } | 567 | } |
568 | 568 | ||
569 | static int xennet_close(struct net_device *dev) | 569 | static int xennet_close(struct net_device *dev) |
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 3c7a5053f1da..c3722b40a651 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c | |||
@@ -827,7 +827,7 @@ static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
827 | if (skb_padto(skb, len)) { | 827 | if (skb_padto(skb, len)) { |
828 | yp->tx_skbuff[entry] = NULL; | 828 | yp->tx_skbuff[entry] = NULL; |
829 | netif_wake_queue(dev); | 829 | netif_wake_queue(dev); |
830 | return 0; | 830 | return NETDEV_TX_OK; |
831 | } | 831 | } |
832 | } | 832 | } |
833 | } | 833 | } |
@@ -881,7 +881,7 @@ static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
881 | printk(KERN_DEBUG "%s: Yellowfin transmit frame #%d queued in slot %d.\n", | 881 | printk(KERN_DEBUG "%s: Yellowfin transmit frame #%d queued in slot %d.\n", |
882 | dev->name, yp->cur_tx, entry); | 882 | dev->name, yp->cur_tx, entry); |
883 | } | 883 | } |
884 | return 0; | 884 | return NETDEV_TX_OK; |
885 | } | 885 | } |
886 | 886 | ||
887 | /* The interrupt handler does all of the Rx thread work and cleans up | 887 | /* The interrupt handler does all of the Rx thread work and cleans up |
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index 0a6992d8611b..7f9e14131a5c 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c | |||
@@ -546,7 +546,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
546 | 546 | ||
547 | if (length < ETH_ZLEN) { | 547 | if (length < ETH_ZLEN) { |
548 | if (skb_padto(skb, ETH_ZLEN)) | 548 | if (skb_padto(skb, ETH_ZLEN)) |
549 | return 0; | 549 | return NETDEV_TX_OK; |
550 | length = ETH_ZLEN; | 550 | length = ETH_ZLEN; |
551 | } | 551 | } |
552 | 552 | ||
@@ -600,7 +600,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
600 | printk(KERN_DEBUG "%s: Transmitter queued, length %d.\n", dev->name, length); | 600 | printk(KERN_DEBUG "%s: Transmitter queued, length %d.\n", dev->name, length); |
601 | } | 601 | } |
602 | dev_kfree_skb(skb); | 602 | dev_kfree_skb(skb); |
603 | return 0; | 603 | return NETDEV_TX_OK; |
604 | } | 604 | } |
605 | 605 | ||
606 | /* The ZNET interrupt handler. */ | 606 | /* The ZNET interrupt handler. */ |