diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:50 -0400 |
commit | 27a1de95a1461ec0589005c293d6ac23a46cb72d (patch) | |
tree | 167e0c9aa3f2b179f4a38a7df734739e0b9cda6d /drivers/net/3c527.c | |
parent | ad096463f7ff809389454ea4219058a36564d55e (diff) |
3com: convert drivers to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/3c527.c')
-rw-r--r-- | drivers/net/3c527.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c index 72b9ed7f4641..6021e6dded8f 100644 --- a/drivers/net/3c527.c +++ b/drivers/net/3c527.c | |||
@@ -213,7 +213,8 @@ static int mc32_probe1(struct net_device *dev, int ioaddr); | |||
213 | static int mc32_command(struct net_device *dev, u16 cmd, void *data, int len); | 213 | static int mc32_command(struct net_device *dev, u16 cmd, void *data, int len); |
214 | static int mc32_open(struct net_device *dev); | 214 | static int mc32_open(struct net_device *dev); |
215 | static void mc32_timeout(struct net_device *dev); | 215 | static void mc32_timeout(struct net_device *dev); |
216 | static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev); | 216 | static netdev_tx_t mc32_send_packet(struct sk_buff *skb, |
217 | struct net_device *dev); | ||
217 | static irqreturn_t mc32_interrupt(int irq, void *dev_id); | 218 | static irqreturn_t mc32_interrupt(int irq, void *dev_id); |
218 | static int mc32_close(struct net_device *dev); | 219 | static int mc32_close(struct net_device *dev); |
219 | static struct net_device_stats *mc32_get_stats(struct net_device *dev); | 220 | static struct net_device_stats *mc32_get_stats(struct net_device *dev); |
@@ -1020,7 +1021,8 @@ static void mc32_timeout(struct net_device *dev) | |||
1020 | * | 1021 | * |
1021 | */ | 1022 | */ |
1022 | 1023 | ||
1023 | static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev) | 1024 | static netdev_tx_t mc32_send_packet(struct sk_buff *skb, |
1025 | struct net_device *dev) | ||
1024 | { | 1026 | { |
1025 | struct mc32_local *lp = netdev_priv(dev); | 1027 | struct mc32_local *lp = netdev_priv(dev); |
1026 | u32 head = atomic_read(&lp->tx_ring_head); | 1028 | u32 head = atomic_read(&lp->tx_ring_head); |