Browse Source

qcacld-3.0: Remove check for conversion of RXMGMT flags to nl80211

Currently, wlan_hdd_cfg80211_convert_rxmgmt_flags  set rxmgmt flags
based on RXMGMT_FLAG_EXTERNAL_AUTH & flag provided by lim.
For some action category like FST, RVS driver itself sets flag value as
RXMGMT_FLAG_NONE. In this case, wlan_hdd_cfg80211_convert_rxmgmt_flags
return -EINVAL and considers it as err.

Fix is to remove if check for wlan_hdd_cfg80211_convert_rxmgmt_flags
to avoid err print in case flag received is RXMGMT_FLAG_NONE.

Change-Id: I321ef05d0571a5b14793d36abfd327dfa97c70a5
CRs-Fixed: 2654080
sheenam monga 5 years ago
parent
commit
3ac6630a69
1 changed files with 3 additions and 8 deletions
  1. 3 8
      core/hdd/src/wlan_hdd_p2p.c

+ 3 - 8
core/hdd/src/wlan_hdd_p2p.c

@@ -982,20 +982,17 @@ wlan_hdd_set_rxmgmt_external_auth_flag(enum nl80211_rxmgmt_flags *nl80211_flag)
  * @flag: flags set by driver(SME/PE) from enum rxmgmt_flags
  *
  * Convert driver internal RXMGMT flag value to nl80211 defined RXMGMT flag
- * Return: 0 on success, -EINVAL on invalid value
+ * Return: void
  */
-static int
+static void
 wlan_hdd_cfg80211_convert_rxmgmt_flags(enum rxmgmt_flags flag,
 				       enum nl80211_rxmgmt_flags *nl80211_flag)
 {
-	int ret = -EINVAL;
 
 	if (flag & RXMGMT_FLAG_EXTERNAL_AUTH) {
 		wlan_hdd_set_rxmgmt_external_auth_flag(nl80211_flag);
-		ret = 0;
 	}
 
-	return ret;
 }
 
 static void
@@ -1092,9 +1089,7 @@ __hdd_indicate_mgmt_frame_to_user(struct hdd_adapter *adapter,
 	hdd_debug("Indicate Frame over NL80211 sessionid : %d, idx :%d",
 		   adapter->vdev_id, adapter->dev->ifindex);
 
-	if (wlan_hdd_cfg80211_convert_rxmgmt_flags(rx_flags, &nl80211_flag))
-		hdd_debug("Failed to convert RXMGMT flags :0x%x to nl80211 format",
-			  rx_flags);
+	wlan_hdd_cfg80211_convert_rxmgmt_flags(rx_flags, &nl80211_flag);
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
 	cfg80211_rx_mgmt(adapter->dev->ieee80211_ptr,