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/ni65.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/ni65.c')
-rw-r--r-- | drivers/net/ni65.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c index 81a061785898..752c2e4d9cf4 100644 --- a/drivers/net/ni65.c +++ b/drivers/net/ni65.c | |||
@@ -252,7 +252,8 @@ static void ni65_xmit_intr(struct net_device *dev,int); | |||
252 | static int ni65_open(struct net_device *dev); | 252 | static int ni65_open(struct net_device *dev); |
253 | static int ni65_lance_reinit(struct net_device *dev); | 253 | static int ni65_lance_reinit(struct net_device *dev); |
254 | static void ni65_init_lance(struct priv *p,unsigned char*,int,int); | 254 | static void ni65_init_lance(struct priv *p,unsigned char*,int,int); |
255 | static int ni65_send_packet(struct sk_buff *skb, struct net_device *dev); | 255 | static netdev_tx_t ni65_send_packet(struct sk_buff *skb, |
256 | struct net_device *dev); | ||
256 | static void ni65_timeout(struct net_device *dev); | 257 | static void ni65_timeout(struct net_device *dev); |
257 | static int ni65_close(struct net_device *dev); | 258 | static int ni65_close(struct net_device *dev); |
258 | static int ni65_alloc_buffer(struct net_device *dev); | 259 | static int ni65_alloc_buffer(struct net_device *dev); |
@@ -1157,7 +1158,8 @@ static void ni65_timeout(struct net_device *dev) | |||
1157 | * Send a packet | 1158 | * Send a packet |
1158 | */ | 1159 | */ |
1159 | 1160 | ||
1160 | static int ni65_send_packet(struct sk_buff *skb, struct net_device *dev) | 1161 | static netdev_tx_t ni65_send_packet(struct sk_buff *skb, |
1162 | struct net_device *dev) | ||
1161 | { | 1163 | { |
1162 | struct priv *p = dev->ml_priv; | 1164 | struct priv *p = dev->ml_priv; |
1163 | 1165 | ||