diff options
Diffstat (limited to 'drivers/net/smc9194.c')
-rw-r--r-- | drivers/net/smc9194.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 | /* |