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/olympic.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/olympic.c')
-rw-r--r-- | drivers/net/tokenring/olympic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index f73f4e684f33..d9ec7f0bbd0a 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c | |||
@@ -182,7 +182,8 @@ MODULE_DEVICE_TABLE(pci,olympic_pci_tbl) ; | |||
182 | static int olympic_probe(struct pci_dev *pdev, const struct pci_device_id *ent); | 182 | static int olympic_probe(struct pci_dev *pdev, const struct pci_device_id *ent); |
183 | static int olympic_init(struct net_device *dev); | 183 | static int olympic_init(struct net_device *dev); |
184 | static int olympic_open(struct net_device *dev); | 184 | static int olympic_open(struct net_device *dev); |
185 | static int olympic_xmit(struct sk_buff *skb, struct net_device *dev); | 185 | static netdev_tx_t olympic_xmit(struct sk_buff *skb, |
186 | struct net_device *dev); | ||
186 | static int olympic_close(struct net_device *dev); | 187 | static int olympic_close(struct net_device *dev); |
187 | static void olympic_set_rx_mode(struct net_device *dev); | 188 | static void olympic_set_rx_mode(struct net_device *dev); |
188 | static void olympic_freemem(struct net_device *dev) ; | 189 | static void olympic_freemem(struct net_device *dev) ; |
@@ -1030,7 +1031,8 @@ static irqreturn_t olympic_interrupt(int irq, void *dev_id) | |||
1030 | return IRQ_HANDLED; | 1031 | return IRQ_HANDLED; |
1031 | } | 1032 | } |
1032 | 1033 | ||
1033 | static int olympic_xmit(struct sk_buff *skb, struct net_device *dev) | 1034 | static netdev_tx_t olympic_xmit(struct sk_buff *skb, |
1035 | struct net_device *dev) | ||
1034 | { | 1036 | { |
1035 | struct olympic_private *olympic_priv=netdev_priv(dev); | 1037 | struct olympic_private *olympic_priv=netdev_priv(dev); |
1036 | u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio; | 1038 | u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio; |