Commit ad891807 authored by Luc Van Oostenryck's avatar Luc Van Oostenryck Committed by Greg Kroah-Hartman

staging/wilc1000: fix wilc_mac_xmit()'s return type

The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, but the implementation in this
driver returns an 'int'.

Fix this by returning 'netdev_tx_t' in this driver too.
Signed-off-by: default avatarLuc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 30ad32cd
...@@ -939,7 +939,7 @@ static void linux_wlan_tx_complete(void *priv, int status) ...@@ -939,7 +939,7 @@ static void linux_wlan_tx_complete(void *priv, int status)
kfree(pv_data); kfree(pv_data);
} }
int wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev) netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev)
{ {
struct wilc_vif *vif; struct wilc_vif *vif;
struct tx_complete_data *tx_data = NULL; struct tx_complete_data *tx_data = NULL;
......
...@@ -298,7 +298,7 @@ void wilc_chip_sleep_manually(struct wilc *wilc); ...@@ -298,7 +298,7 @@ void wilc_chip_sleep_manually(struct wilc *wilc);
void wilc_enable_tcp_ack_filter(bool value); void wilc_enable_tcp_ack_filter(bool value);
int wilc_wlan_get_num_conn_ifcs(struct wilc *wilc); int wilc_wlan_get_num_conn_ifcs(struct wilc *wilc);
int wilc_mac_xmit(struct sk_buff *skb, struct net_device *dev); netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *dev);
void wilc_wfi_p2p_rx(struct net_device *dev, u8 *buff, u32 size); void wilc_wfi_p2p_rx(struct net_device *dev, u8 *buff, u32 size);
void host_wakeup_notify(struct wilc *wilc); void host_wakeup_notify(struct wilc *wilc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment