commit 61a84108547c1c017683f15311ccbede249fc6fa
author Stephen Hemminger <shemminger@vyatta.com> Mon Aug 31 19:50:46 2009 +0000
committer David S. Miller <davem@davemloft.net> Tue Sep 01 01:13:26 2009 -0700
tree 3786cb1e39ca881a15576dfddfeef6105dc098a7
parent 25a79c41ce0ce88a4288adf278e9b0e00f228383

tokenring: convert to netdev_tx_t

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/tokenring/olympic.c

diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index f73f4e6..d9ec7f0 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -182,7 +182,8 @@
 static int olympic_probe(struct pci_dev *pdev, const struct pci_device_id *ent); 
 static int olympic_init(struct net_device *dev);
 static int olympic_open(struct net_device *dev);
-static int olympic_xmit(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t olympic_xmit(struct sk_buff *skb,
+				      struct net_device *dev);
 static int olympic_close(struct net_device *dev);
 static void olympic_set_rx_mode(struct net_device *dev);
 static void olympic_freemem(struct net_device *dev) ;  
@@ -1030,7 +1031,8 @@
 	return IRQ_HANDLED;
 }	
 
-static int olympic_xmit(struct sk_buff *skb, struct net_device *dev) 
+static netdev_tx_t olympic_xmit(struct sk_buff *skb,
+				      struct net_device *dev)
 {
 	struct olympic_private *olympic_priv=netdev_priv(dev);
 	u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio;