shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-05-30 15:56:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Luc Van Oostenryck
2018-04-24 15:18:57 +02:00
committed by Greg Kroah-Hartman
parent 30ad32cd62
commit ad8918077d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/wilc1000/linux_wlan.c
View File

@@ -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;

2
drivers/staging/wilc1000/wilc_wlan.h
View File

@@ -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);