Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/wilc1000/linux_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ static void linux_wlan_tx_complete(void *priv, int status) 
	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 tx_complete_data *tx_data = NULL;

drivers/staging/wilc1000/wilc_wlan.h

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ void wilc_chip_sleep_manually(struct wilc *wilc); 


void wilc_enable_tcp_ack_filter(bool value);

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 host_wakeup_notify(struct wilc *wilc);