aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ni52.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/ni52.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/ni52.c')
-rw-r--r--drivers/net/ni52.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index a0ac5d4f27d3..bd0ac690d12c 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -170,7 +170,7 @@ static int ni52_probe1(struct net_device *dev, int ioaddr);
170static irqreturn_t ni52_interrupt(int irq, void *dev_id); 170static irqreturn_t ni52_interrupt(int irq, void *dev_id);
171static int ni52_open(struct net_device *dev); 171static int ni52_open(struct net_device *dev);
172static int ni52_close(struct net_device *dev); 172static int ni52_close(struct net_device *dev);
173static int ni52_send_packet(struct sk_buff *, struct net_device *); 173static netdev_tx_t ni52_send_packet(struct sk_buff *, struct net_device *);
174static struct net_device_stats *ni52_get_stats(struct net_device *dev); 174static struct net_device_stats *ni52_get_stats(struct net_device *dev);
175static void set_multicast_list(struct net_device *dev); 175static void set_multicast_list(struct net_device *dev);
176static void ni52_timeout(struct net_device *dev); 176static void ni52_timeout(struct net_device *dev);
@@ -1173,7 +1173,8 @@ static void ni52_timeout(struct net_device *dev)
1173 * send frame 1173 * send frame
1174 */ 1174 */
1175 1175
1176static int ni52_send_packet(struct sk_buff *skb, struct net_device *dev) 1176static netdev_tx_t ni52_send_packet(struct sk_buff *skb,
1177 struct net_device *dev)
1177{ 1178{
1178 int len, i; 1179 int len, i;
1179#ifndef NO_NOPCOMMANDS 1180#ifndef NO_NOPCOMMANDS