diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:14:07 -0400 |
commit | 61357325f377889a1daffa14962d705dc814dd0e (patch) | |
tree | 7b436f1097abbc5681de6d1e5901f62963b42220 /drivers/net/sb1000.c | |
parent | d0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (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/sb1000.c')
-rw-r--r-- | drivers/net/sb1000.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index 6a81aec645d9..ee366c5a8fa3 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c | |||
@@ -82,7 +82,8 @@ struct sb1000_private { | |||
82 | extern int sb1000_probe(struct net_device *dev); | 82 | extern int sb1000_probe(struct net_device *dev); |
83 | static int sb1000_open(struct net_device *dev); | 83 | static int sb1000_open(struct net_device *dev); |
84 | static int sb1000_dev_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd); | 84 | static int sb1000_dev_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd); |
85 | static int sb1000_start_xmit(struct sk_buff *skb, struct net_device *dev); | 85 | static netdev_tx_t sb1000_start_xmit(struct sk_buff *skb, |
86 | struct net_device *dev); | ||
86 | static irqreturn_t sb1000_interrupt(int irq, void *dev_id); | 87 | static irqreturn_t sb1000_interrupt(int irq, void *dev_id); |
87 | static int sb1000_close(struct net_device *dev); | 88 | static int sb1000_close(struct net_device *dev); |
88 | 89 | ||
@@ -1080,7 +1081,7 @@ static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
1080 | } | 1081 | } |
1081 | 1082 | ||
1082 | /* transmit function: do nothing since SB1000 can't send anything out */ | 1083 | /* transmit function: do nothing since SB1000 can't send anything out */ |
1083 | static int | 1084 | static netdev_tx_t |
1084 | sb1000_start_xmit(struct sk_buff *skb, struct net_device *dev) | 1085 | sb1000_start_xmit(struct sk_buff *skb, struct net_device *dev) |
1085 | { | 1086 | { |
1086 | printk(KERN_WARNING "%s: trying to transmit!!!\n", dev->name); | 1087 | printk(KERN_WARNING "%s: trying to transmit!!!\n", dev->name); |