diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:46 -0400 |
commit | ad096463f7ff809389454ea4219058a36564d55e (patch) | |
tree | 2155a3dc61332d6fd78958e72411e93454a81287 /drivers/net/tulip/xircom_cb.c | |
parent | 3a27c149ab0e31a7b86e5ee6a27bb3b8b5687f32 (diff) |
tulip: convert drivers 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/tulip/xircom_cb.c')
-rw-r--r-- | drivers/net/tulip/xircom_cb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c index 22b6a239fb33..0f2ca5980c3c 100644 --- a/drivers/net/tulip/xircom_cb.c +++ b/drivers/net/tulip/xircom_cb.c | |||
@@ -113,7 +113,8 @@ struct xircom_private { | |||
113 | static int xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id); | 113 | static int xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id); |
114 | static void xircom_remove(struct pci_dev *pdev); | 114 | static void xircom_remove(struct pci_dev *pdev); |
115 | static irqreturn_t xircom_interrupt(int irq, void *dev_instance); | 115 | static irqreturn_t xircom_interrupt(int irq, void *dev_instance); |
116 | static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev); | 116 | static netdev_tx_t xircom_start_xmit(struct sk_buff *skb, |
117 | struct net_device *dev); | ||
117 | static int xircom_open(struct net_device *dev); | 118 | static int xircom_open(struct net_device *dev); |
118 | static int xircom_close(struct net_device *dev); | 119 | static int xircom_close(struct net_device *dev); |
119 | static void xircom_up(struct xircom_private *card); | 120 | static void xircom_up(struct xircom_private *card); |
@@ -384,7 +385,8 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance) | |||
384 | return IRQ_HANDLED; | 385 | return IRQ_HANDLED; |
385 | } | 386 | } |
386 | 387 | ||
387 | static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev) | 388 | static netdev_tx_t xircom_start_xmit(struct sk_buff *skb, |
389 | struct net_device *dev) | ||
388 | { | 390 | { |
389 | struct xircom_private *card; | 391 | struct xircom_private *card; |
390 | unsigned long flags; | 392 | unsigned long flags; |