qcacld-3.0: Avoid to add duplicate HE IE

Host will set HE IE by channel mode, and needn't copy he ie to
additional ie. Otherwise, there will be two he ies in beacon frames of
P2P GO.

Change-Id: Ia144bb5e96f00114658a371ef27c65f90a6c7df2
CRs-Fixed: 2549450

core/hdd/src/wlan_hdd_hostapd.c

@@ -3846,42 +3846,6 @@ static void wlan_hdd_check_11gmode(const u8 *ie, u8 *require_ht,
 	}
 }
 
-#ifdef WLAN_FEATURE_11AX
-/**
- * wlan_hdd_add_extn_ie() - add extension IE
- * @adapter: Pointer to hostapd adapter
- * @genie: Pointer to ie to be added
- * @total_ielen: Pointer to store total ie length
- * @oui: Pointer to oui
- * @oui_size: Size of oui
- *
- * Return: 0 for success non-zero for failure
- */
-static int wlan_hdd_add_extn_ie(struct hdd_adapter *adapter, uint8_t *genie,
-			   uint16_t *total_ielen, uint8_t *oui,
-			   uint8_t oui_size)
-{
-	const uint8_t *ie;
-	uint16_t ielen = 0;
-	struct hdd_beacon_data *beacon = adapter->session.ap.beacon;
-
-	ie = wlan_get_ext_ie_ptr_from_ext_id(oui, oui_size,
-					     beacon->tail,
-					     beacon->tail_len);
-	if (ie) {
-		ielen = ie[1] + 2;
-		if ((*total_ielen + ielen) <= MAX_GENIE_LEN) {
-			qdf_mem_copy(&genie[*total_ielen], ie, ielen);
-		} else {
-			hdd_err("**Ie Length is too big***");
-			return -EINVAL;
-		}
-		*total_ielen += ielen;
-	}
-	return 0;
-}
-#endif
-
 /**
  * wlan_hdd_add_hostapd_conf_vsie() - configure Vendor IE in sap mode
  * @adapter: Pointer to hostapd adapter
@@ -4126,41 +4090,6 @@ static void wlan_hdd_add_sap_obss_scan_ie(
 }
 #endif
 
-/**
- * wlan_hdd_cfg80211_update_apies() - update ap mode 11ax ies
- * @adapter: Pointer to hostapd adapter
- * @genie: generic IE buffer
- * @total_ielen: out param to update total ielen
- *
- * Return: 0 for success non-zero for failure
- */
-
-#ifdef WLAN_FEATURE_11AX
-static int hdd_update_11ax_apies(struct hdd_adapter *adapter,
-				 uint8_t *genie, uint16_t *total_ielen)
-{
-	if (wlan_hdd_add_extn_ie(adapter, genie, total_ielen,
-			    HE_CAP_OUI_TYPE, HE_CAP_OUI_SIZE)) {
-		hdd_err("Adding HE Cap ie failed");
-		return -EINVAL;
-	}
-
-	if (wlan_hdd_add_extn_ie(adapter, genie, total_ielen,
-			    HE_OP_OUI_TYPE, HE_OP_OUI_SIZE)) {
-		hdd_err("Adding HE Op ie failed");
-		return -EINVAL;
-	}
-
-	return 0;
-}
-#else
-static int hdd_update_11ax_apies(struct hdd_adapter *adapter,
-				 uint8_t *genie, uint16_t *total_ielen)
-{
-	return 0;
-}
-#endif
-
 /**
  * wlan_hdd_cfg80211_update_apies() - update ap mode ies
  * @adapter: Pointer to hostapd adapter
@@ -4211,10 +4140,6 @@ int wlan_hdd_cfg80211_update_apies(struct hdd_adapter *adapter)
 	wlan_hdd_add_hostapd_conf_vsie(adapter, genie,
 				       &total_ielen);
 
-	ret = hdd_update_11ax_apies(adapter, genie, &total_ielen);
-	if (ret)
-		goto done;
-
 	wlan_hdd_add_sap_obss_scan_ie(adapter, genie, &total_ielen);
 
 	qdf_copy_macaddr(&update_ie.bssid, &adapter->mac_addr);