aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring/smctr.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:46 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:26 -0400
commit61a84108547c1c017683f15311ccbede249fc6fa (patch)
tree3786cb1e39ca881a15576dfddfeef6105dc098a7 /drivers/net/tokenring/smctr.c
parent25a79c41ce0ce88a4288adf278e9b0e00f228383 (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/smctr.c')
-rw-r--r--drivers/net/tokenring/smctr.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 23e012f5bbf4..ebda61bc4c2f 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -234,7 +234,8 @@ static int smctr_rx_frame(struct net_device *dev);
234 234
235/* S */ 235/* S */
236static int smctr_send_dat(struct net_device *dev); 236static int smctr_send_dat(struct net_device *dev);
237static int smctr_send_packet(struct sk_buff *skb, struct net_device *dev); 237static netdev_tx_t smctr_send_packet(struct sk_buff *skb,
238 struct net_device *dev);
238static int smctr_send_lobe_media_test(struct net_device *dev); 239static int smctr_send_lobe_media_test(struct net_device *dev);
239static int smctr_send_rpt_addr(struct net_device *dev, MAC_HEADER *rmf, 240static int smctr_send_rpt_addr(struct net_device *dev, MAC_HEADER *rmf,
240 __u16 correlator); 241 __u16 correlator);
@@ -4571,7 +4572,8 @@ static void smctr_timeout(struct net_device *dev)
4571/* 4572/*
4572 * Gets skb from system, queues it and checks if it can be sent 4573 * Gets skb from system, queues it and checks if it can be sent
4573 */ 4574 */
4574static int smctr_send_packet(struct sk_buff *skb, struct net_device *dev) 4575static netdev_tx_t smctr_send_packet(struct sk_buff *skb,
4576 struct net_device *dev)
4575{ 4577{
4576 struct net_local *tp = netdev_priv(dev); 4578 struct net_local *tp = netdev_priv(dev);
4577 4579