diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:14:07 -0400 |
commit | 61357325f377889a1daffa14962d705dc814dd0e (patch) | |
tree | 7b436f1097abbc5681de6d1e5901f62963b42220 /drivers/net/epic100.c | |
parent | d0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (diff) |
netdev: convert bulk of drivers to netdev_tx_t
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>
Diffstat (limited to 'drivers/net/epic100.c')
-rw-r--r-- | drivers/net/epic100.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index d668ff2af6e3..641a10d2e843 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
@@ -298,7 +298,8 @@ static void epic_restart(struct net_device *dev); | |||
298 | static void epic_timer(unsigned long data); | 298 | static void epic_timer(unsigned long data); |
299 | static void epic_tx_timeout(struct net_device *dev); | 299 | static void epic_tx_timeout(struct net_device *dev); |
300 | static void epic_init_ring(struct net_device *dev); | 300 | static void epic_init_ring(struct net_device *dev); |
301 | static int epic_start_xmit(struct sk_buff *skb, struct net_device *dev); | 301 | static netdev_tx_t epic_start_xmit(struct sk_buff *skb, |
302 | struct net_device *dev); | ||
302 | static int epic_rx(struct net_device *dev, int budget); | 303 | static int epic_rx(struct net_device *dev, int budget); |
303 | static int epic_poll(struct napi_struct *napi, int budget); | 304 | static int epic_poll(struct napi_struct *napi, int budget); |
304 | static irqreturn_t epic_interrupt(int irq, void *dev_instance); | 305 | static irqreturn_t epic_interrupt(int irq, void *dev_instance); |
@@ -961,7 +962,7 @@ static void epic_init_ring(struct net_device *dev) | |||
961 | return; | 962 | return; |
962 | } | 963 | } |
963 | 964 | ||
964 | static int epic_start_xmit(struct sk_buff *skb, struct net_device *dev) | 965 | static netdev_tx_t epic_start_xmit(struct sk_buff *skb, struct net_device *dev) |
965 | { | 966 | { |
966 | struct epic_private *ep = netdev_priv(dev); | 967 | struct epic_private *ep = netdev_priv(dev); |
967 | int entry, free_count; | 968 | int entry, free_count; |