From de28a9df54915c3bd1686d330d9b05a4bbf0ae64 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Mon, 19 Mar 2018 19:19:49 -0700 Subject: [PATCH] qcacld-3.0: Fix return type mismatch in start_xmit functions Function declaration and definition has return type mismatch. Hence fix this. Change-Id: Icf5f6c435811b7d0801da10bb6f1dfb322cc8dc8 CRs-Fixed: 2208843 --- core/hdd/inc/wlan_hdd_softap_tx_rx.h | 4 ++-- core/hdd/inc/wlan_hdd_tx_rx.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_softap_tx_rx.h b/core/hdd/inc/wlan_hdd_softap_tx_rx.h index d2c71eee356e..add58dd9e5ea 100644 --- a/core/hdd/inc/wlan_hdd_softap_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_softap_tx_rx.h @@ -37,8 +37,8 @@ #include #include -int hdd_softap_hard_start_xmit(struct sk_buff *skb, - struct net_device *dev); +netdev_tx_t hdd_softap_hard_start_xmit(struct sk_buff *skb, + struct net_device *dev); void hdd_softap_tx_timeout(struct net_device *dev); QDF_STATUS hdd_softap_init_tx_rx(struct hdd_adapter *adapter); QDF_STATUS hdd_softap_deinit_tx_rx(struct hdd_adapter *adapter); diff --git a/core/hdd/inc/wlan_hdd_tx_rx.h b/core/hdd/inc/wlan_hdd_tx_rx.h index 27d57ed8a8da..9689b0c497d0 100644 --- a/core/hdd/inc/wlan_hdd_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_tx_rx.h @@ -59,7 +59,7 @@ struct hdd_context; #define SME_QOS_UAPSD_CFG_VI_CHANGED_MASK 0xF4 #define SME_QOS_UAPSD_CFG_VO_CHANGED_MASK 0xF8 -int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); +netdev_tx_t hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); void hdd_tx_timeout(struct net_device *dev); QDF_STATUS hdd_init_tx_rx(struct hdd_adapter *adapter);