diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:26 -0400 |
commit | 61a84108547c1c017683f15311ccbede249fc6fa (patch) | |
tree | 3786cb1e39ca881a15576dfddfeef6105dc098a7 /drivers/net/tokenring/lanstreamer.c | |
parent | 25a79c41ce0ce88a4288adf278e9b0e00f228383 (diff) |
tokenring: convert 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/tokenring/lanstreamer.c')
-rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index d07e61a9499e..26dca2b2bdbd 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -203,7 +203,8 @@ static int streamer_ioctl(struct net_device *, struct ifreq *, int); | |||
203 | 203 | ||
204 | static int streamer_reset(struct net_device *dev); | 204 | static int streamer_reset(struct net_device *dev); |
205 | static int streamer_open(struct net_device *dev); | 205 | static int streamer_open(struct net_device *dev); |
206 | static int streamer_xmit(struct sk_buff *skb, struct net_device *dev); | 206 | static netdev_tx_t streamer_xmit(struct sk_buff *skb, |
207 | struct net_device *dev); | ||
207 | static int streamer_close(struct net_device *dev); | 208 | static int streamer_close(struct net_device *dev); |
208 | static void streamer_set_rx_mode(struct net_device *dev); | 209 | static void streamer_set_rx_mode(struct net_device *dev); |
209 | static irqreturn_t streamer_interrupt(int irq, void *dev_id); | 210 | static irqreturn_t streamer_interrupt(int irq, void *dev_id); |
@@ -1141,7 +1142,8 @@ static irqreturn_t streamer_interrupt(int irq, void *dev_id) | |||
1141 | return IRQ_HANDLED; | 1142 | return IRQ_HANDLED; |
1142 | } | 1143 | } |
1143 | 1144 | ||
1144 | static int streamer_xmit(struct sk_buff *skb, struct net_device *dev) | 1145 | static netdev_tx_t streamer_xmit(struct sk_buff *skb, |
1146 | struct net_device *dev) | ||
1145 | { | 1147 | { |
1146 | struct streamer_private *streamer_priv = | 1148 | struct streamer_private *streamer_priv = |
1147 | netdev_priv(dev); | 1149 | netdev_priv(dev); |