aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/x25_asy.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-06-23 02:03:08 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-05 22:16:04 -0400
commit6ed106549d17474ca17a16057f4c0ed4eba5a7ca (patch)
treeb98c09081509b3a9757339b6b66779e4126dfa29 /drivers/net/wan/x25_asy.c
parent0e8635a8e1f2d4a9e1bfc6c3b21419a5921e674f (diff)
net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions
This patch is the result of an automatic spatch transformation to convert all ndo_start_xmit() return values of 0 to NETDEV_TX_OK. Some occurences are missed by the automatic conversion, those will be handled in a seperate patch. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan/x25_asy.c')
-rw-r--r--drivers/net/wan/x25_asy.c10
1 files changed, 5 insertions, 5 deletions
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