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/s2io.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/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 3138df5773ee..ddccf5fa56b6 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -4072,7 +4072,7 @@ static int s2io_close(struct net_device *dev) | |||
4072 | * 0 on success & 1 on failure. | 4072 | * 0 on success & 1 on failure. |
4073 | */ | 4073 | */ |
4074 | 4074 | ||
4075 | static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | 4075 | static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev) |
4076 | { | 4076 | { |
4077 | struct s2io_nic *sp = netdev_priv(dev); | 4077 | struct s2io_nic *sp = netdev_priv(dev); |
4078 | u16 frg_cnt, frg_len, i, queue, queue_len, put_off, get_off; | 4078 | u16 frg_cnt, frg_len, i, queue, queue_len, put_off, get_off; |