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/atp.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/atp.c')
-rw-r--r-- | drivers/net/atp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index 4beacc9c909f..9043294fe617 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
@@ -199,7 +199,8 @@ static int net_open(struct net_device *dev); | |||
199 | static void hardware_init(struct net_device *dev); | 199 | static void hardware_init(struct net_device *dev); |
200 | static void write_packet(long ioaddr, int length, unsigned char *packet, int pad, int mode); | 200 | static void write_packet(long ioaddr, int length, unsigned char *packet, int pad, int mode); |
201 | static void trigger_send(long ioaddr, int length); | 201 | static void trigger_send(long ioaddr, int length); |
202 | static int atp_send_packet(struct sk_buff *skb, struct net_device *dev); | 202 | static netdev_tx_t atp_send_packet(struct sk_buff *skb, |
203 | struct net_device *dev); | ||
203 | static irqreturn_t atp_interrupt(int irq, void *dev_id); | 204 | static irqreturn_t atp_interrupt(int irq, void *dev_id); |
204 | static void net_rx(struct net_device *dev); | 205 | static void net_rx(struct net_device *dev); |
205 | static void read_block(long ioaddr, int length, unsigned char *buffer, int data_mode); | 206 | static void read_block(long ioaddr, int length, unsigned char *buffer, int data_mode); |
@@ -552,7 +553,8 @@ static void tx_timeout(struct net_device *dev) | |||
552 | dev->stats.tx_errors++; | 553 | dev->stats.tx_errors++; |
553 | } | 554 | } |
554 | 555 | ||
555 | static int atp_send_packet(struct sk_buff *skb, struct net_device *dev) | 556 | static netdev_tx_t atp_send_packet(struct sk_buff *skb, |
557 | struct net_device *dev) | ||
556 | { | 558 | { |
557 | struct net_local *lp = netdev_priv(dev); | 559 | struct net_local *lp = netdev_priv(dev); |
558 | long ioaddr = dev->base_addr; | 560 | long ioaddr = dev->base_addr; |