Browse Source

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
Srinivas Girigowda 7 years ago
parent
commit
49b48b2eae
2 changed files with 9 additions and 7 deletions
  1. 5 4
      core/hdd/src/wlan_hdd_softap_tx_rx.c
  2. 4 3
      core/hdd/src/wlan_hdd_tx_rx.c

+ 5 - 4
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);

+ 4 - 3
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);