diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:14:04 -0400 |
commit | d0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (patch) | |
tree | c201ed345e104100288d57c8b3ae46d486b56118 /drivers/net/wimax | |
parent | 0fc480987e69f22b9212f087545b4d1ca6950807 (diff) |
wireless: convert drivers to netdev_tx_t
Mostly just simple conversions:
* ray_cs had bogus return of NET_TX_LOCKED but driver
was not using NETIF_F_LLTX
* hostap and ipw2x00 had some code that returned value
from a called function that also had to change to return 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/wimax')
-rw-r--r-- | drivers/net/wimax/i2400m/netdev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c index 9653f478b382..796396cb4c82 100644 --- a/drivers/net/wimax/i2400m/netdev.c +++ b/drivers/net/wimax/i2400m/netdev.c | |||
@@ -334,12 +334,12 @@ int i2400m_net_tx(struct i2400m *i2400m, struct net_device *net_dev, | |||
334 | * that will sleep. See i2400m_net_wake_tx() for details. | 334 | * that will sleep. See i2400m_net_wake_tx() for details. |
335 | */ | 335 | */ |
336 | static | 336 | static |
337 | int i2400m_hard_start_xmit(struct sk_buff *skb, | 337 | netdev_tx_t i2400m_hard_start_xmit(struct sk_buff *skb, |
338 | struct net_device *net_dev) | 338 | struct net_device *net_dev) |
339 | { | 339 | { |
340 | int result; | ||
341 | struct i2400m *i2400m = net_dev_to_i2400m(net_dev); | 340 | struct i2400m *i2400m = net_dev_to_i2400m(net_dev); |
342 | struct device *dev = i2400m_dev(i2400m); | 341 | struct device *dev = i2400m_dev(i2400m); |
342 | int result; | ||
343 | 343 | ||
344 | d_fnstart(3, dev, "(skb %p net_dev %p)\n", skb, net_dev); | 344 | d_fnstart(3, dev, "(skb %p net_dev %p)\n", skb, net_dev); |
345 | if (i2400m->state == I2400M_SS_IDLE) | 345 | if (i2400m->state == I2400M_SS_IDLE) |
@@ -353,9 +353,9 @@ int i2400m_hard_start_xmit(struct sk_buff *skb, | |||
353 | net_dev->stats.tx_bytes += skb->len; | 353 | net_dev->stats.tx_bytes += skb->len; |
354 | } | 354 | } |
355 | kfree_skb(skb); | 355 | kfree_skb(skb); |
356 | result = NETDEV_TX_OK; | 356 | |
357 | d_fnend(3, dev, "(skb %p net_dev %p) = %d\n", skb, net_dev, result); | 357 | d_fnend(3, dev, "(skb %p net_dev %p)\n", skb, net_dev); |
358 | return result; | 358 | return NETDEV_TX_OK; |
359 | } | 359 | } |
360 | 360 | ||
361 | 361 | ||