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/lp486e.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/lp486e.c')
-rw-r--r-- | drivers/net/lp486e.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index c292bad411ee..cc3ed9cf28be 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c | |||
@@ -377,7 +377,7 @@ static char init_setup[14] = { | |||
377 | }; | 377 | }; |
378 | 378 | ||
379 | static int i596_open(struct net_device *dev); | 379 | static int i596_open(struct net_device *dev); |
380 | static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev); | 380 | static netdev_tx_t i596_start_xmit(struct sk_buff *skb, struct net_device *dev); |
381 | static irqreturn_t i596_interrupt(int irq, void *dev_id); | 381 | static irqreturn_t i596_interrupt(int irq, void *dev_id); |
382 | static int i596_close(struct net_device *dev); | 382 | static int i596_close(struct net_device *dev); |
383 | static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd); | 383 | static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd); |
@@ -863,7 +863,7 @@ static int i596_open(struct net_device *dev) | |||
863 | return 0; /* Always succeed */ | 863 | return 0; /* Always succeed */ |
864 | } | 864 | } |
865 | 865 | ||
866 | static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) { | 866 | static netdev_tx_t i596_start_xmit (struct sk_buff *skb, struct net_device *dev) { |
867 | struct tx_cmd *tx_cmd; | 867 | struct tx_cmd *tx_cmd; |
868 | short length; | 868 | short length; |
869 | 869 | ||