Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[sfrench/cifs-2.6.git] / drivers / net / irda / mcs7780.c

diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index fac504d0cfd86d46f84ad94a880bc689bf122676..f4df1001983cb170426ef799735d93aa81874ca1 100644 (file)
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -824,10 +824,6 @@ static int mcs_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
        int wraplen;
        int ret = 0;
 
-
-       if (skb == NULL || ndev == NULL)
-               return -EINVAL;
-
        netif_stop_queue(ndev);
        mcs = netdev_priv(ndev);
 
@@ -870,7 +866,7 @@ static int mcs_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
 
        dev_kfree_skb(skb);
        spin_unlock_irqrestore(&mcs->lock, flags);
-       return ret;
+       return NETDEV_TX_OK;
 }
 
 static const struct net_device_ops mcs_netdev_ops = {