diff options
Diffstat (limited to 'drivers/net/hamradio')
-rw-r--r-- | drivers/net/hamradio/6pack.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/baycom_epp.c | 6 | ||||
-rw-r--r-- | drivers/net/hamradio/bpqether.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/dmascc.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/hdlcdrv.c | 4 | ||||
-rw-r--r-- | drivers/net/hamradio/mkiss.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/scc.c | 6 | ||||
-rw-r--r-- | drivers/net/hamradio/yam.c | 2 |
8 files changed, 13 insertions, 13 deletions
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) |