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/prism54 | |
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/prism54')
-rw-r--r-- | drivers/net/wireless/prism54/islpci_eth.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/islpci_eth.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c index 9b5ee3419287..872b64783e78 100644 --- a/drivers/net/wireless/prism54/islpci_eth.c +++ b/drivers/net/wireless/prism54/islpci_eth.c | |||
@@ -72,7 +72,7 @@ islpci_eth_cleanup_transmit(islpci_private *priv, | |||
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | int | 75 | netdev_tx_t |
76 | islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev) | 76 | islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev) |
77 | { | 77 | { |
78 | islpci_private *priv = netdev_priv(ndev); | 78 | islpci_private *priv = netdev_priv(ndev); |
diff --git a/drivers/net/wireless/prism54/islpci_eth.h b/drivers/net/wireless/prism54/islpci_eth.h index 61454d32d74d..54f9a4b7bf9b 100644 --- a/drivers/net/wireless/prism54/islpci_eth.h +++ b/drivers/net/wireless/prism54/islpci_eth.h | |||
@@ -64,7 +64,7 @@ struct avs_80211_1_header { | |||
64 | }; | 64 | }; |
65 | 65 | ||
66 | void islpci_eth_cleanup_transmit(islpci_private *, isl38xx_control_block *); | 66 | void islpci_eth_cleanup_transmit(islpci_private *, isl38xx_control_block *); |
67 | int islpci_eth_transmit(struct sk_buff *, struct net_device *); | 67 | netdev_tx_t islpci_eth_transmit(struct sk_buff *, struct net_device *); |
68 | int islpci_eth_receive(islpci_private *); | 68 | int islpci_eth_receive(islpci_private *); |
69 | void islpci_eth_tx_timeout(struct net_device *); | 69 | void islpci_eth_tx_timeout(struct net_device *); |
70 | void islpci_do_reset_and_wake(struct work_struct *); | 70 | void islpci_do_reset_and_wake(struct work_struct *); |