aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring/ibmtr.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/ibmtr.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/ibmtr.c')
-rw-r--r--drivers/net/tokenring/ibmtr.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 96d00c8f8d3e..525bbc5b9c9d 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -191,7 +191,8 @@ static int tok_init_card(struct net_device *dev);
191static void tok_open_adapter(unsigned long dev_addr); 191static void tok_open_adapter(unsigned long dev_addr);
192static void open_sap(unsigned char type, struct net_device *dev); 192static void open_sap(unsigned char type, struct net_device *dev);
193static void tok_set_multicast_list(struct net_device *dev); 193static void tok_set_multicast_list(struct net_device *dev);
194static int tok_send_packet(struct sk_buff *skb, struct net_device *dev); 194static netdev_tx_t tok_send_packet(struct sk_buff *skb,
195 struct net_device *dev);
195static int tok_close(struct net_device *dev); 196static int tok_close(struct net_device *dev);
196static irqreturn_t tok_interrupt(int irq, void *dev_id); 197static irqreturn_t tok_interrupt(int irq, void *dev_id);
197static void initial_tok_int(struct net_device *dev); 198static void initial_tok_int(struct net_device *dev);
@@ -1022,7 +1023,8 @@ static void tok_set_multicast_list(struct net_device *dev)
1022 1023
1023#define STATION_ID_OFST 4 1024#define STATION_ID_OFST 4
1024 1025
1025static int tok_send_packet(struct sk_buff *skb, struct net_device *dev) 1026static netdev_tx_t tok_send_packet(struct sk_buff *skb,
1027 struct net_device *dev)
1026{ 1028{
1027 struct tok_info *ti; 1029 struct tok_info *ti;
1028 unsigned long flags; 1030 unsigned long flags;