Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / net / yellowfin.c

diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index a075801..7676423 100644 (file)
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -830,7 +830,7 @@ static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        if (skb_padto(skb, len)) {
                                yp->tx_skbuff[entry] = NULL;
                                netif_wake_queue(dev);
-                               return 0;
+                               return NETDEV_TX_OK;
                        }
                }
        }
@@ -884,7 +884,7 @@ static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev)
                printk(KERN_DEBUG "%s: Yellowfin transmit frame #%d queued in slot %d.\n",
                           dev->name, yp->cur_tx, entry);
        }
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 /* The interrupt handler does all of the Rx thread work and cleans up