diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:28 -0400 |
commit | d71a674922e7519edb477ecb585e7d29d69c7aa7 (patch) | |
tree | 816f6936957d5dbe2670079f64bdbd1f52cec00d /drivers/net/wan/dscc4.c | |
parent | 61a84108547c1c017683f15311ccbede249fc6fa (diff) |
wan: 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/wan/dscc4.c')
-rw-r--r-- | drivers/net/wan/dscc4.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index cc00e0f89ecb..b2247bd0d492 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c | |||
@@ -359,7 +359,8 @@ static void dscc4_tx_irq(struct dscc4_pci_priv *, struct dscc4_dev_priv *); | |||
359 | static int dscc4_found1(struct pci_dev *, void __iomem *ioaddr); | 359 | static int dscc4_found1(struct pci_dev *, void __iomem *ioaddr); |
360 | static int dscc4_init_one(struct pci_dev *, const struct pci_device_id *ent); | 360 | static int dscc4_init_one(struct pci_dev *, const struct pci_device_id *ent); |
361 | static int dscc4_open(struct net_device *); | 361 | static int dscc4_open(struct net_device *); |
362 | static int dscc4_start_xmit(struct sk_buff *, struct net_device *); | 362 | static netdev_tx_t dscc4_start_xmit(struct sk_buff *, |
363 | struct net_device *); | ||
363 | static int dscc4_close(struct net_device *); | 364 | static int dscc4_close(struct net_device *); |
364 | static int dscc4_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 365 | static int dscc4_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
365 | static int dscc4_init_ring(struct net_device *); | 366 | static int dscc4_init_ring(struct net_device *); |
@@ -1148,7 +1149,8 @@ static int dscc4_tx_poll(struct dscc4_dev_priv *dpriv, struct net_device *dev) | |||
1148 | } | 1149 | } |
1149 | #endif /* DSCC4_POLLING */ | 1150 | #endif /* DSCC4_POLLING */ |
1150 | 1151 | ||
1151 | static int dscc4_start_xmit(struct sk_buff *skb, struct net_device *dev) | 1152 | static netdev_tx_t dscc4_start_xmit(struct sk_buff *skb, |
1153 | struct net_device *dev) | ||
1152 | { | 1154 | { |
1153 | struct dscc4_dev_priv *dpriv = dscc4_priv(dev); | 1155 | struct dscc4_dev_priv *dpriv = dscc4_priv(dev); |
1154 | struct dscc4_pci_priv *ppriv = dpriv->pci_priv; | 1156 | struct dscc4_pci_priv *ppriv = dpriv->pci_priv; |