From 49b48b2eaebf5cdee4fe1862be2ca5ba0d14e7dd Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 5 Apr 2018 09:23:28 -0700 Subject: [PATCH] qcacld-3.0: Fix function return type for ndo_start_xmit Fix function return type for ndo_start_xmit. Currently .ndo_start_xmit callback functions returns int, but the correct return type should be netdev_tx_t. Change-Id: I36d3cc886bfa0fd74a264f2791f09a251baab2ef CRs-Fixed: 2202134 --- core/hdd/src/wlan_hdd_softap_tx_rx.c | 9 +++++---- core/hdd/src/wlan_hdd_tx_rx.c | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 8d331e5fe2c4..2496df84b67a 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -423,8 +423,8 @@ int hdd_inspect_dhcp_packet(struct hdd_adapter *adapter, * * Return: Always returns NETDEV_TX_OK */ -static int __hdd_softap_hard_start_xmit(struct sk_buff *skb, - struct net_device *dev) +static netdev_tx_t __hdd_softap_hard_start_xmit(struct sk_buff *skb, + struct net_device *dev) { sme_ac_enum_type ac = SME_AC_BE; struct hdd_adapter *adapter = (struct hdd_adapter *) netdev_priv(dev); @@ -640,9 +640,10 @@ drop_pkt_accounting: * * Return: Always returns NETDEV_TX_OK */ -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) { - int ret; + netdev_tx_t ret; cds_ssr_protect(__func__); ret = __hdd_softap_hard_start_xmit(skb, dev); diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 645ce1568e67..78d8b8944ca1 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -828,7 +828,8 @@ void hdd_tx_rx_collect_connectivity_stats_info(struct sk_buff *skb, * * Return: Always returns NETDEV_TX_OK */ -static int __hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t __hdd_hard_start_xmit(struct sk_buff *skb, + struct net_device *dev) { QDF_STATUS status; sme_ac_enum_type ac; @@ -1117,9 +1118,9 @@ drop_pkt_accounting: * * Return: Always returns NETDEV_TX_OK */ -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) { - int ret; + netdev_tx_t ret; cds_ssr_protect(__func__); ret = __hdd_hard_start_xmit(skb, dev);