diff options
Diffstat (limited to 'drivers/net/myri10ge/myri10ge.c')
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 1f6e36ea669e..1a34f7e11d98 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 | ||
@@ -2968,13 +2968,13 @@ static int myri10ge_sw_tso(struct sk_buff *skb, struct net_device *dev) | |||
2968 | } | 2968 | } |
2969 | } | 2969 | } |
2970 | dev_kfree_skb_any(skb); | 2970 | dev_kfree_skb_any(skb); |
2971 | return 0; | 2971 | return NETDEV_TX_OK; |
2972 | 2972 | ||
2973 | drop: | 2973 | drop: |
2974 | ss = &mgp->ss[skb_get_queue_mapping(skb)]; | 2974 | ss = &mgp->ss[skb_get_queue_mapping(skb)]; |
2975 | dev_kfree_skb_any(skb); | 2975 | dev_kfree_skb_any(skb); |
2976 | ss->stats.tx_dropped += 1; | 2976 | ss->stats.tx_dropped += 1; |
2977 | return 0; | 2977 | return NETDEV_TX_OK; |
2978 | } | 2978 | } |
2979 | 2979 | ||
2980 | static struct net_device_stats *myri10ge_get_stats(struct net_device *dev) | 2980 | static struct net_device_stats *myri10ge_get_stats(struct net_device *dev) |