lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netdev: convert bulk of drivers to netdev_tx_t

Browse Source 
In a couple of cases collapse some extra code like:
   int retval = NETDEV_TX_OK;
   ...
   return retval;
into
   return NETDEV_TX_OK;

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger
2009-08-31 19:50:58 +00:00
committed by David S. Miller
parent d0cf9c0dad
commit 61357325f3
102 changed files with 253 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/r6040.c
View File

@ -883,13 +883,13 @@ static int r6040_open(struct net_device *dev)
return 0;
}
static int r6040_start_xmit(struct sk_buff *skb, struct net_device *dev)
static netdev_tx_t r6040_start_xmit(struct sk_buff *skb,
struct net_device *dev)
{
struct r6040_private *lp = netdev_priv(dev);
struct r6040_descriptor *descptr;
void __iomem *ioaddr = lp->base;
unsigned long flags;
int ret = NETDEV_TX_OK;
/* Critical Section */
spin_lock_irqsave(&lp->lock, flags);
@ -899,8 +899,7 @@ static int r6040_start_xmit(struct sk_buff *skb, struct net_device *dev)
spin_unlock_irqrestore(&lp->lock, flags);
netif_stop_queue(dev);
printk(KERN_ERR DRV_NAME ": no tx descriptor\n");
ret = NETDEV_TX_BUSY;
return ret;
return NETDEV_TX_BUSY;
}
/* Statistic Counter */
@ -928,7 +927,8 @@ static int r6040_start_xmit(struct sk_buff *skb, struct net_device *dev)
dev->trans_start = jiffies;
spin_unlock_irqrestore(&lp->lock, flags);
return ret;
return NETDEV_TX_OK;
}
static void r6040_multicast_list(struct net_device *dev)