diff options
Diffstat (limited to 'net/atm')
-rw-r--r-- | net/atm/br2684.c | 4 | ||||
-rw-r--r-- | net/atm/clip.c | 12 | ||||
-rw-r--r-- | net/atm/lec.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index 2912665fc58c..848af113ba2a 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
@@ -238,7 +238,7 @@ static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
238 | /* netif_stop_queue(dev); */ | 238 | /* netif_stop_queue(dev); */ |
239 | dev_kfree_skb(skb); | 239 | dev_kfree_skb(skb); |
240 | read_unlock(&devs_lock); | 240 | read_unlock(&devs_lock); |
241 | return 0; | 241 | return NETDEV_TX_OK; |
242 | } | 242 | } |
243 | if (!br2684_xmit_vcc(skb, dev, brvcc)) { | 243 | if (!br2684_xmit_vcc(skb, dev, brvcc)) { |
244 | /* | 244 | /* |
@@ -252,7 +252,7 @@ static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
252 | dev->stats.tx_fifo_errors++; | 252 | dev->stats.tx_fifo_errors++; |
253 | } | 253 | } |
254 | read_unlock(&devs_lock); | 254 | read_unlock(&devs_lock); |
255 | return 0; | 255 | return NETDEV_TX_OK; |
256 | } | 256 | } |
257 | 257 | ||
258 | /* | 258 | /* |
diff --git a/net/atm/clip.c b/net/atm/clip.c index e65a3b1477f8..64910bb86089 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c | |||
@@ -373,7 +373,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
373 | printk(KERN_ERR "clip_start_xmit: skb_dst(skb) == NULL\n"); | 373 | printk(KERN_ERR "clip_start_xmit: skb_dst(skb) == NULL\n"); |
374 | dev_kfree_skb(skb); | 374 | dev_kfree_skb(skb); |
375 | dev->stats.tx_dropped++; | 375 | dev->stats.tx_dropped++; |
376 | return 0; | 376 | return NETDEV_TX_OK; |
377 | } | 377 | } |
378 | if (!skb_dst(skb)->neighbour) { | 378 | if (!skb_dst(skb)->neighbour) { |
379 | #if 0 | 379 | #if 0 |
@@ -387,7 +387,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
387 | printk(KERN_ERR "clip_start_xmit: NO NEIGHBOUR !\n"); | 387 | printk(KERN_ERR "clip_start_xmit: NO NEIGHBOUR !\n"); |
388 | dev_kfree_skb(skb); | 388 | dev_kfree_skb(skb); |
389 | dev->stats.tx_dropped++; | 389 | dev->stats.tx_dropped++; |
390 | return 0; | 390 | return NETDEV_TX_OK; |
391 | } | 391 | } |
392 | entry = NEIGH2ENTRY(skb_dst(skb)->neighbour); | 392 | entry = NEIGH2ENTRY(skb_dst(skb)->neighbour); |
393 | if (!entry->vccs) { | 393 | if (!entry->vccs) { |
@@ -402,7 +402,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
402 | dev_kfree_skb(skb); | 402 | dev_kfree_skb(skb); |
403 | dev->stats.tx_dropped++; | 403 | dev->stats.tx_dropped++; |
404 | } | 404 | } |
405 | return 0; | 405 | return NETDEV_TX_OK; |
406 | } | 406 | } |
407 | pr_debug("neigh %p, vccs %p\n", entry, entry->vccs); | 407 | pr_debug("neigh %p, vccs %p\n", entry, entry->vccs); |
408 | ATM_SKB(skb)->vcc = vcc = entry->vccs->vcc; | 408 | ATM_SKB(skb)->vcc = vcc = entry->vccs->vcc; |
@@ -421,14 +421,14 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
421 | old = xchg(&entry->vccs->xoff, 1); /* assume XOFF ... */ | 421 | old = xchg(&entry->vccs->xoff, 1); /* assume XOFF ... */ |
422 | if (old) { | 422 | if (old) { |
423 | printk(KERN_WARNING "clip_start_xmit: XOFF->XOFF transition\n"); | 423 | printk(KERN_WARNING "clip_start_xmit: XOFF->XOFF transition\n"); |
424 | return 0; | 424 | return NETDEV_TX_OK; |
425 | } | 425 | } |
426 | dev->stats.tx_packets++; | 426 | dev->stats.tx_packets++; |
427 | dev->stats.tx_bytes += skb->len; | 427 | dev->stats.tx_bytes += skb->len; |
428 | vcc->send(vcc, skb); | 428 | vcc->send(vcc, skb); |
429 | if (atm_may_send(vcc, 0)) { | 429 | if (atm_may_send(vcc, 0)) { |
430 | entry->vccs->xoff = 0; | 430 | entry->vccs->xoff = 0; |
431 | return 0; | 431 | return NETDEV_TX_OK; |
432 | } | 432 | } |
433 | spin_lock_irqsave(&clip_priv->xoff_lock, flags); | 433 | spin_lock_irqsave(&clip_priv->xoff_lock, flags); |
434 | netif_stop_queue(dev); /* XOFF -> throttle immediately */ | 434 | netif_stop_queue(dev); /* XOFF -> throttle immediately */ |
@@ -440,7 +440,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
440 | of the brief netif_stop_queue. If this isn't true or if it | 440 | of the brief netif_stop_queue. If this isn't true or if it |
441 | changes, use netif_wake_queue instead. */ | 441 | changes, use netif_wake_queue instead. */ |
442 | spin_unlock_irqrestore(&clip_priv->xoff_lock, flags); | 442 | spin_unlock_irqrestore(&clip_priv->xoff_lock, flags); |
443 | return 0; | 443 | return NETDEV_TX_OK; |
444 | } | 444 | } |
445 | 445 | ||
446 | static int clip_mkip(struct atm_vcc *vcc, int timeout) | 446 | static int clip_mkip(struct atm_vcc *vcc, int timeout) |
diff --git a/net/atm/lec.c b/net/atm/lec.c index ff2e594dca9b..c463868c993b 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
@@ -289,7 +289,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
289 | skb2 = skb_realloc_headroom(skb, LEC_HEADER_LEN); | 289 | skb2 = skb_realloc_headroom(skb, LEC_HEADER_LEN); |
290 | kfree_skb(skb); | 290 | kfree_skb(skb); |
291 | if (skb2 == NULL) | 291 | if (skb2 == NULL) |
292 | return 0; | 292 | return NETDEV_TX_OK; |
293 | skb = skb2; | 293 | skb = skb2; |
294 | } | 294 | } |
295 | skb_push(skb, 2); | 295 | skb_push(skb, 2); |
@@ -307,7 +307,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
307 | skb2 = skb_realloc_headroom(skb, LEC_HEADER_LEN); | 307 | skb2 = skb_realloc_headroom(skb, LEC_HEADER_LEN); |
308 | kfree_skb(skb); | 308 | kfree_skb(skb); |
309 | if (skb2 == NULL) | 309 | if (skb2 == NULL) |
310 | return 0; | 310 | return NETDEV_TX_OK; |
311 | skb = skb2; | 311 | skb = skb2; |
312 | } | 312 | } |
313 | #endif | 313 | #endif |
@@ -345,7 +345,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
345 | dev_kfree_skb(skb); | 345 | dev_kfree_skb(skb); |
346 | if (skb2 == NULL) { | 346 | if (skb2 == NULL) { |
347 | dev->stats.tx_dropped++; | 347 | dev->stats.tx_dropped++; |
348 | return 0; | 348 | return NETDEV_TX_OK; |
349 | } | 349 | } |
350 | skb = skb2; | 350 | skb = skb2; |
351 | } | 351 | } |
@@ -416,7 +416,7 @@ out: | |||
416 | if (entry) | 416 | if (entry) |
417 | lec_arp_put(entry); | 417 | lec_arp_put(entry); |
418 | dev->trans_start = jiffies; | 418 | dev->trans_start = jiffies; |
419 | return 0; | 419 | return NETDEV_TX_OK; |
420 | } | 420 | } |
421 | 421 | ||
422 | /* The inverse routine to net_open(). */ | 422 | /* The inverse routine to net_open(). */ |