It is correct incomplete merge of fastforward

It is correct incomplete merge of gerrit
Icc3fe6d5a28201d44bdc65848be61701b8c085fd

Change-Id: I40ea48f1dc17601fed101b3b5ef21dd13d72993b
CRs-Fixed: 1084347

7 files changed, 0 insertions, 219 deletions

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 7caa0f04725b..29d3c63c5d94 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -14498,33 +14498,6 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
         }
     }
 
-    pIe = wlan_hdd_cfg80211_get_ie_ptr(&pMgmt_frame->u.beacon.variable[0],
-            pBeacon->head_len, WLAN_EID_SUPP_RATES);
-    if (pIe != NULL) {
-        pIe++;
-        pConfig->supported_rates.numRates = pIe[0];
-        pIe++;
-        for (i = 0; i < pConfig->supported_rates.numRates; i++)
-            if (pIe[i]) {
-                pConfig->supported_rates.rate[i]= pIe[i];
-                hddLog(LOG1, FL("Configured Supported rate is %2x"),
-                        pConfig->supported_rates.rate[i]);
-            }
-    }
-    pIe = wlan_hdd_cfg80211_get_ie_ptr(pBeacon->tail, pBeacon->tail_len,
-            WLAN_EID_EXT_SUPP_RATES);
-    if (pIe != NULL) {
-        pIe++;
-        pConfig->extended_rates.numRates = pIe[0];
-        pIe++;
-        for (i = 0; i < pConfig->extended_rates.numRates; i++)
-            if (pIe[i]){
-                pConfig->extended_rates.rate[i]= pIe[i];
-                hddLog(LOG1, FL("Configured extended Supported rate is %2x"),
-                        pConfig->extended_rates.rate[i]);
-            }
-    }
-
     wlan_hdd_set_sapHwmode(pHostapdAdapter);
 
     if (pHddCtx->cfg_ini->sap_force_11n_for_11ac) {
@@ -15187,15 +15160,6 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
         hddLog(VOS_TRACE_LEVEL_DEBUG, FL("Reached max concurrent connections"));
         return -EINVAL;
     }
-    if (pAdapter->device_mode == WLAN_HDD_P2P_GO) {
-        hdd_adapter_t  *pP2pAdapter = NULL;
-        pP2pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_P2P_DEVICE);
-        if (pP2pAdapter) {
-            hddLog(VOS_TRACE_LEVEL_DEBUG,
-                FL("cancel active p2p device ROC before GO starting"));
-            wlan_hdd_cancel_existing_remain_on_channel(pP2pAdapter);
-        }
-    }
 
     if (WLAN_HDD_SOFTAP == pAdapter->device_mode)
         hdd_wlan_green_ap_start_bss(pHddCtx);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index d567f2d84646..53eda8c65877 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -15866,7 +15866,6 @@ err_ipa_cleanup:
 
 err_wiphy_unregister:
    wiphy_unregister(wiphy);
-   wlan_hdd_cfg80211_deinit(wiphy);
 
 err_vosclose:
    status = vos_sched_close( pVosContext );
@@ -16026,48 +16025,6 @@ static int hdd_register_fail_clean_up(v_CONTEXT_t vos_context)
 	return -ENODEV;
 }
 
-/* accommodate the request firmware bin time out 2 min */
-#define REQUEST_FWR_TIMEOUT 120000
-#define HDD_WLAN_START_WAIT_TIME (VOS_WDA_TIMEOUT + 5000 + REQUEST_FWR_TIMEOUT)
-/**
- * hdd_hif_register_driver() - API for HDD to register with HIF
- *
- * API for HDD to register with HIF layer
- *
- * Return: success/failure
- */
-int hdd_hif_register_driver(void)
-{
-	int ret;
-	unsigned long rc, timeout;
-
-	init_completion(&wlan_comp.wlan_start_comp);
-	wlan_comp.status = 0;
-
-	ret = hif_register_driver();
-
-	if (ret) {
-		hddLog(LOGE, FL("HIF registration failed"));
-		return ret;
-	}
-
-	timeout = msecs_to_jiffies(HDD_WLAN_START_WAIT_TIME);
-
-	rc = wait_for_completion_timeout(&wlan_comp.wlan_start_comp, timeout);
-
-	if (!rc) {
-		hddLog(LOGE, FL("hif registration timedout"));
-		return -EAGAIN;
-	}
-
-	if (wlan_comp.status)
-		hddLog(LOGE,
-		       FL("hdd_wlan_startup failed status:%d jiffies_left:%lu"),
-		       wlan_comp.status, rc);
-
-	return wlan_comp.status;
-}
-
 /**---------------------------------------------------------------------------
 
   \brief hdd_driver_init() - Core Driver Init Function
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h
index 99ced05dfbf5..e95a0b63b53e 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h
@@ -65,17 +65,6 @@ typedef void (*__adf_nbuf_callback_fn) (struct sk_buff *skb);
 #define CVG_NBUF_MAX_EXTRA_FRAGS 2
 
 typedef void (*adf_nbuf_trace_update_t)(char *);
-struct nbuf_rx_cb {
-	uint8_t dp_trace:1,
-		    reserved:7;
-	uint8_t packet_trace;
-};
-
-#define ADF_NBUF_CB_RX_DP_TRACE(skb) \
-	(((struct nbuf_rx_cb*)((skb)->cb))->dp_trace)
-
-#define ADF_NBUF_CB_RX_PACKET_TRACE(skb) \
-	(((struct nbuf_rx_cb*)((skb)->cb))->packet_trace)
 
 struct cvg_nbuf_cb {
     /*
diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h
index 0d0e60d066d2..7c4d18220230 100644
--- a/CORE/SERVICES/COMMON/wmi_unified.h
+++ b/CORE/SERVICES/COMMON/wmi_unified.h
@@ -11444,67 +11444,6 @@ typedef struct {
 /** FW response when tx failure count has reached threshold
  *  for a peer */
 typedef struct {
-    /**
-     * TLV tag and len; tag equals
-     * WMITLV_TAG_STRUC_wmi_peer_antdiv_info_req_cmd_fixed_param
-     */
-    A_UINT32 tlv_header;
-    /**
-     * In order to get the peer antdiv info for a single peer, host shall
-     * issue the peer_mac_address of that peer. For getting the
-     * info all peers, the host shall issue 0xFFFFFFFF as the mac
-     * address. The firmware will return the peer info for all the
-     * peers on the specified vdev_id
-     */
-    wmi_mac_addr peer_mac_address;
-    /** vdev id */
-    A_UINT32 vdev_id;
-} wmi_peer_antdiv_info_req_cmd_fixed_param;
-
-/** FW response with the peer antdiv info */
-typedef struct {
-    /** TLV tag and len; tag equals
-     * WMITLV_TAG_STRUC_wmi_peer_antdiv_info_event_fixed_param
-     */
-    A_UINT32 tlv_header;
-    /** number of peers in peer_info */
-    A_UINT32 num_peers;
-    /** VDEV to which the peer belongs to */
-    A_UINT32 vdev_id;
-    /**
-     * This TLV is followed by another TLV of array of structs
-     * wmi_peer_antdiv_info peer_antdiv_info[];
-     */
-} wmi_peer_antdiv_info_event_fixed_param;
-
-typedef struct {
-    /**
-     * TLV tag and len; tag equals
-     * WMITLV_TAG_STRUC_wmi_peer_antdiv_info
-     */
-    A_UINT32 tlv_header;
-    /** mac addr of the peer */
-    wmi_mac_addr peer_mac_address;
-    /**
-     * per chain rssi of the peer, for up to 8 chains.
-     * Each chain's entry reports the RSSI for different bandwidths:
-     * bits 7:0   -> primary 20 MHz
-     * bits 15:8  -> secondary 20 MHz of  40 MHz channel (if applicable)
-     * bits 23:16 -> secondary 40 MHz of  80 MHz channel (if applicable)
-     * bits 31:24 -> secondary 80 MHz of 160 MHz channel (if applicable)
-     * Each of these 8-bit RSSI reports is in dB units, with respect to
-     * the noise floor.
-     * 0x80 means invalid.
-     * All unused bytes within used chain_rssi indices shall be set
-     * to 0x80.
-     * All unused chain_rssi indices shall be set to 0x80808080.
-     */
-    A_INT32 chain_rssi[8];
-} wmi_peer_antdiv_info;
-
-/** FW response when tx failure count has reached threshold
- *  for a peer */
-typedef struct {
     /** TLV tag and len; tag equals
      *  WMITLV_TAG_STRUC_wmi_peer_tx_fail_cnt_thr_event_fixed_param */
     A_UINT32 tlv_header;
diff --git a/CORE/SERVICES/HTC/htc.c b/CORE/SERVICES/HTC/htc.c
index 8a771b920720..0600149dc55a 100644
--- a/CORE/SERVICES/HTC/htc.c
+++ b/CORE/SERVICES/HTC/htc.c
@@ -241,7 +241,6 @@ HTC_HANDLE HTCCreate(void *ol_sc, HTC_INIT_INFO *pInfo, adf_os_device_t osdev)
     adf_os_spinlock_init(&target->HTCRxLock);
     adf_os_spinlock_init(&target->HTCTxLock);
     adf_os_spinlock_init(&target->HTCCreditLock);
-    target->is_nodrop_pkt = FALSE;
 
     for (j = 0; j < ENDPOINT_MAX; j++) {
         pEndpoint = &target->EndPoint[j];
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index 0544cb76c561..d986cf0d1849 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -30634,61 +30634,6 @@ static void wma_update_sta_inactivity_timeout(tp_wma_handle wma,
 }
 
 /*
- * wma_update_sta_inactivity_timeout() - Set sta_inactivity_timeout to fw
- * @wma_handle: WMA handle
- * @sta_inactivity_timer: sme_sta_inactivity_timeout
- *
- * This function is used to set sta_inactivity_timeout.
- * If a station does not send anything in sta_inactivity_timeout seconds, an
- * empty data frame is sent to it in order to verify whether it is
- * still in range. If this frame is not ACKed, the station will be
- * disassociated and then deauthenticated.
- *
- * Return: None
- */
-static void wma_update_sta_inactivity_timeout(tp_wma_handle wma,
-		struct sme_sta_inactivity_timeout  *sta_inactivity_timer)
-{
-	u_int8_t vdev_id;
-	u_int32_t max_unresponsive_time;
-	u_int32_t min_inactive_time, max_inactive_time;
-
-	if (!wma || !wma->wmi_handle) {
-		WMA_LOGE(FL("WMA is closed, can not issue sta_inactivity_timeout"));
-		return;
-	}
-	vdev_id = sta_inactivity_timer->session_id;
-	max_unresponsive_time = sta_inactivity_timer->sta_inactivity_timeout;
-	max_inactive_time = max_unresponsive_time* 2/3;
-	min_inactive_time = max_unresponsive_time - max_inactive_time ;
-
-	if (wmi_unified_vdev_set_param_send(wma->wmi_handle,
-			vdev_id,
-			WMI_VDEV_PARAM_AP_KEEPALIVE_MIN_IDLE_INACTIVE_TIME_SECS,
-				min_inactive_time))
-		WMA_LOGE("Failed to Set AP MIN IDLE INACTIVE TIME");
-
-	if (wmi_unified_vdev_set_param_send(wma->wmi_handle,
-			vdev_id,
-			WMI_VDEV_PARAM_AP_KEEPALIVE_MAX_IDLE_INACTIVE_TIME_SECS,
-				max_inactive_time))
-		WMA_LOGE("Failed to Set AP MAX IDLE INACTIVE TIME");
-
-
-	if (wmi_unified_vdev_set_param_send(wma->wmi_handle,
-			vdev_id,
-			WMI_VDEV_PARAM_AP_KEEPALIVE_MAX_UNRESPONSIVE_TIME_SECS,
-			max_unresponsive_time))
-		WMA_LOGE("Failed to Set MAX UNRESPONSIVE TIME");
-
-	WMA_LOGD("%s:vdev_id:%d min_inactive_time: %u max_inactive_time: %u"
-		" max_unresponsive_time: %u", __func__, vdev_id,
-		min_inactive_time, max_inactive_time, max_unresponsive_time);
-
-	return;
-}
-
-/*
  * function   : wma_mc_process_msg
  * Description :
  * Args       :
diff --git a/Kbuild b/Kbuild
index b6608fd2908d..94b73edc1522 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1052,18 +1052,6 @@ endif
 endif
 endif
 
-ifeq ($(CONFIG_WLAN_FEATURE_DSRC), y)
-CDEFINES += -DWLAN_FEATURE_DSRC
-endif
-
-ifeq ($(CONFIG_ARCH_MDMCALIFORNIUM), y)
-ifeq ($(CONFIG_QCA_WIFI_SDIO), 1)
-ifeq ($(CONFIG_WCNSS_SKB_PRE_ALLOC), y)
-CDEFINES += -DFEATURE_SKB_PRE_ALLOC
-endif
-endif
-endif
-
 ifeq ($(CONFIG_ARCH_MDM9607), y)
 ifeq ($(CONFIG_QCA_WIFI_SDIO), 1)
 CDEFINES += -DHIF_SYNC_READ