aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/dscc4.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:47 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:28 -0400
commitd71a674922e7519edb477ecb585e7d29d69c7aa7 (patch)
tree816f6936957d5dbe2670079f64bdbd1f52cec00d /drivers/net/wan/dscc4.c
parent61a84108547c1c017683f15311ccbede249fc6fa (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.c6
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 *);
359static int dscc4_found1(struct pci_dev *, void __iomem *ioaddr); 359static int dscc4_found1(struct pci_dev *, void __iomem *ioaddr);
360static int dscc4_init_one(struct pci_dev *, const struct pci_device_id *ent); 360static int dscc4_init_one(struct pci_dev *, const struct pci_device_id *ent);
361static int dscc4_open(struct net_device *); 361static int dscc4_open(struct net_device *);
362static int dscc4_start_xmit(struct sk_buff *, struct net_device *); 362static netdev_tx_t dscc4_start_xmit(struct sk_buff *,
363 struct net_device *);
363static int dscc4_close(struct net_device *); 364static int dscc4_close(struct net_device *);
364static int dscc4_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); 365static int dscc4_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
365static int dscc4_init_ring(struct net_device *); 366static 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
1151static int dscc4_start_xmit(struct sk_buff *skb, struct net_device *dev) 1152static 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;