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/at1700.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/at1700.c')
-rw-r--r-- | drivers/net/at1700.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 5349c58d1fae..544d5af6950e 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c | |||
@@ -159,7 +159,8 @@ struct net_local { | |||
159 | static int at1700_probe1(struct net_device *dev, int ioaddr); | 159 | static int at1700_probe1(struct net_device *dev, int ioaddr); |
160 | static int read_eeprom(long ioaddr, int location); | 160 | static int read_eeprom(long ioaddr, int location); |
161 | static int net_open(struct net_device *dev); | 161 | static int net_open(struct net_device *dev); |
162 | static int net_send_packet(struct sk_buff *skb, struct net_device *dev); | 162 | static netdev_tx_t net_send_packet(struct sk_buff *skb, |
163 | struct net_device *dev); | ||
163 | static irqreturn_t net_interrupt(int irq, void *dev_id); | 164 | static irqreturn_t net_interrupt(int irq, void *dev_id); |
164 | static void net_rx(struct net_device *dev); | 165 | static void net_rx(struct net_device *dev); |
165 | static int net_close(struct net_device *dev); | 166 | static int net_close(struct net_device *dev); |
@@ -595,7 +596,8 @@ static void net_tx_timeout (struct net_device *dev) | |||
595 | } | 596 | } |
596 | 597 | ||
597 | 598 | ||
598 | static int net_send_packet (struct sk_buff *skb, struct net_device *dev) | 599 | static netdev_tx_t net_send_packet (struct sk_buff *skb, |
600 | struct net_device *dev) | ||
599 | { | 601 | { |
600 | struct net_local *lp = netdev_priv(dev); | 602 | struct net_local *lp = netdev_priv(dev); |
601 | int ioaddr = dev->base_addr; | 603 | int ioaddr = dev->base_addr; |