aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/depca.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:58 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:14:07 -0400
commit61357325f377889a1daffa14962d705dc814dd0e (patch)
tree7b436f1097abbc5681de6d1e5901f62963b42220 /drivers/net/depca.c
parentd0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (diff)
netdev: convert bulk of drivers to netdev_tx_t
In a couple of cases collapse some extra code like: int retval = NETDEV_TX_OK; ... return retval; into return NETDEV_TX_OK; Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/depca.c')
-rw-r--r--drivers/net/depca.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index adb997c5bb5d..9686c1fa28f1 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -516,7 +516,8 @@ struct depca_private {
516** Public Functions 516** Public Functions
517*/ 517*/
518static int depca_open(struct net_device *dev); 518static int depca_open(struct net_device *dev);
519static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev); 519static netdev_tx_t depca_start_xmit(struct sk_buff *skb,
520 struct net_device *dev);
520static irqreturn_t depca_interrupt(int irq, void *dev_id); 521static irqreturn_t depca_interrupt(int irq, void *dev_id);
521static int depca_close(struct net_device *dev); 522static int depca_close(struct net_device *dev);
522static int depca_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); 523static int depca_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
@@ -928,7 +929,8 @@ static void depca_tx_timeout(struct net_device *dev)
928/* 929/*
929** Writes a socket buffer to TX descriptor ring and starts transmission 930** Writes a socket buffer to TX descriptor ring and starts transmission
930*/ 931*/
931static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev) 932static netdev_tx_t depca_start_xmit(struct sk_buff *skb,
933 struct net_device *dev)
932{ 934{
933 struct depca_private *lp = netdev_priv(dev); 935 struct depca_private *lp = netdev_priv(dev);
934 u_long ioaddr = dev->base_addr; 936 u_long ioaddr = dev->base_addr;