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/ipw2x00/libipw.h | |
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/ipw2x00/libipw.h')
-rw-r--r-- | drivers/net/wireless/ipw2x00/libipw.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw.h b/drivers/net/wireless/ipw2x00/libipw.h index 8f91d3427ce..bf45391172f 100644 --- a/drivers/net/wireless/ipw2x00/libipw.h +++ b/drivers/net/wireless/ipw2x00/libipw.h | |||
@@ -867,8 +867,8 @@ struct libipw_device { | |||
867 | /* Callback functions */ | 867 | /* Callback functions */ |
868 | void (*set_security) (struct net_device * dev, | 868 | void (*set_security) (struct net_device * dev, |
869 | struct libipw_security * sec); | 869 | struct libipw_security * sec); |
870 | int (*hard_start_xmit) (struct libipw_txb * txb, | 870 | netdev_tx_t (*hard_start_xmit) (struct libipw_txb * txb, |
871 | struct net_device * dev, int pri); | 871 | struct net_device * dev, int pri); |
872 | int (*reset_port) (struct net_device * dev); | 872 | int (*reset_port) (struct net_device * dev); |
873 | int (*is_queue_full) (struct net_device * dev, int pri); | 873 | int (*is_queue_full) (struct net_device * dev, int pri); |
874 | 874 | ||
@@ -1028,7 +1028,8 @@ extern void libipw_networks_age(struct libipw_device *ieee, | |||
1028 | extern int libipw_set_encryption(struct libipw_device *ieee); | 1028 | extern int libipw_set_encryption(struct libipw_device *ieee); |
1029 | 1029 | ||
1030 | /* libipw_tx.c */ | 1030 | /* libipw_tx.c */ |
1031 | extern int libipw_xmit(struct sk_buff *skb, struct net_device *dev); | 1031 | extern netdev_tx_t libipw_xmit(struct sk_buff *skb, |
1032 | struct net_device *dev); | ||
1032 | extern void libipw_txb_free(struct libipw_txb *); | 1033 | extern void libipw_txb_free(struct libipw_txb *); |
1033 | 1034 | ||
1034 | /* libipw_rx.c */ | 1035 | /* libipw_rx.c */ |