aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring/3c359.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/3c359.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/3c359.c')
-rw-r--r--drivers/net/tokenring/3c359.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 1787d52941bc..724158966ec1 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -128,7 +128,7 @@ static int xl_init(struct net_device *dev);
128static int xl_open(struct net_device *dev); 128static int xl_open(struct net_device *dev);
129static int xl_open_hw(struct net_device *dev) ; 129static int xl_open_hw(struct net_device *dev) ;
130static int xl_hw_reset(struct net_device *dev); 130static int xl_hw_reset(struct net_device *dev);
131static int xl_xmit(struct sk_buff *skb, struct net_device *dev); 131static netdev_tx_t xl_xmit(struct sk_buff *skb, struct net_device *dev);
132static void xl_dn_comp(struct net_device *dev); 132static void xl_dn_comp(struct net_device *dev);
133static int xl_close(struct net_device *dev); 133static int xl_close(struct net_device *dev);
134static void xl_set_rx_mode(struct net_device *dev); 134static void xl_set_rx_mode(struct net_device *dev);
@@ -1193,7 +1193,7 @@ static irqreturn_t xl_interrupt(int irq, void *dev_id)
1193 * Tx - Polling configuration 1193 * Tx - Polling configuration
1194 */ 1194 */
1195 1195
1196static int xl_xmit(struct sk_buff *skb, struct net_device *dev) 1196static netdev_tx_t xl_xmit(struct sk_buff *skb, struct net_device *dev)
1197{ 1197{
1198 struct xl_private *xl_priv=netdev_priv(dev); 1198 struct xl_private *xl_priv=netdev_priv(dev);
1199 struct xl_tx_desc *txd ; 1199 struct xl_tx_desc *txd ;