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/wireless/airo.c | |
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/wireless/airo.c')
-rw-r--r-- | drivers/net/wireless/airo.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index c150c4858576..7116a1aa20ce 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -1920,7 +1920,9 @@ static int airo_open(struct net_device *dev) { | |||
1920 | return 0; | 1920 | return 0; |
1921 | } | 1921 | } |
1922 | 1922 | ||
1923 | static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) { | 1923 | static netdev_tx_t mpi_start_xmit(struct sk_buff *skb, |
1924 | struct net_device *dev) | ||
1925 | { | ||
1924 | int npacks, pending; | 1926 | int npacks, pending; |
1925 | unsigned long flags; | 1927 | unsigned long flags; |
1926 | struct airo_info *ai = dev->ml_priv; | 1928 | struct airo_info *ai = dev->ml_priv; |
@@ -2119,7 +2121,9 @@ static void airo_end_xmit(struct net_device *dev) { | |||
2119 | dev_kfree_skb(skb); | 2121 | dev_kfree_skb(skb); |
2120 | } | 2122 | } |
2121 | 2123 | ||
2122 | static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) { | 2124 | static netdev_tx_t airo_start_xmit(struct sk_buff *skb, |
2125 | struct net_device *dev) | ||
2126 | { | ||
2123 | s16 len; | 2127 | s16 len; |
2124 | int i, j; | 2128 | int i, j; |
2125 | struct airo_info *priv = dev->ml_priv; | 2129 | struct airo_info *priv = dev->ml_priv; |
@@ -2184,7 +2188,9 @@ static void airo_end_xmit11(struct net_device *dev) { | |||
2184 | dev_kfree_skb(skb); | 2188 | dev_kfree_skb(skb); |
2185 | } | 2189 | } |
2186 | 2190 | ||
2187 | static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) { | 2191 | static netdev_tx_t airo_start_xmit11(struct sk_buff *skb, |
2192 | struct net_device *dev) | ||
2193 | { | ||
2188 | s16 len; | 2194 | s16 len; |
2189 | int i, j; | 2195 | int i, j; |
2190 | struct airo_info *priv = dev->ml_priv; | 2196 | struct airo_info *priv = dev->ml_priv; |