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/fealnx.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/fealnx.c')
-rw-r--r-- | drivers/net/fealnx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index f66da84a9398..18d5fbb9673e 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c | |||
@@ -433,7 +433,7 @@ static void netdev_timer(unsigned long data); | |||
433 | static void reset_timer(unsigned long data); | 433 | static void reset_timer(unsigned long data); |
434 | static void fealnx_tx_timeout(struct net_device *dev); | 434 | static void fealnx_tx_timeout(struct net_device *dev); |
435 | static void init_ring(struct net_device *dev); | 435 | static void init_ring(struct net_device *dev); |
436 | static int start_tx(struct sk_buff *skb, struct net_device *dev); | 436 | static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev); |
437 | static irqreturn_t intr_handler(int irq, void *dev_instance); | 437 | static irqreturn_t intr_handler(int irq, void *dev_instance); |
438 | static int netdev_rx(struct net_device *dev); | 438 | static int netdev_rx(struct net_device *dev); |
439 | static void set_rx_mode(struct net_device *dev); | 439 | static void set_rx_mode(struct net_device *dev); |
@@ -1305,7 +1305,7 @@ static void init_ring(struct net_device *dev) | |||
1305 | } | 1305 | } |
1306 | 1306 | ||
1307 | 1307 | ||
1308 | static int start_tx(struct sk_buff *skb, struct net_device *dev) | 1308 | static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev) |
1309 | { | 1309 | { |
1310 | struct netdev_private *np = netdev_priv(dev); | 1310 | struct netdev_private *np = netdev_priv(dev); |
1311 | unsigned long flags; | 1311 | unsigned long flags; |