qcacld-3.0: Update GENERIC_DATA length and Kbuild

Update Kbuild with SON binaries based on SON config flag
and GENERIC_DATA policy with proper length

Change-Id: I60d06b3bdcc600095d7e9ad779e9b779f5477e33
CRs-Fixed: 3136142

components/p2p/core/src/wlan_p2p_off_chan_tx.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -135,7 +135,9 @@ static QDF_STATUS p2p_vdev_check_valid(struct tx_action_context *tx_ctx)
 	    (tx_ctx->frame_info.sub_type == P2P_MGMT_ACTION) &&
 	    (tx_ctx->frame_info.public_action_type ==
 	     P2P_PUBLIC_ACTION_NOT_SUPPORT) &&
-	    (tx_ctx->frame_info.action_type == P2P_ACTION_NOT_SUPPORT)) {
+	    (tx_ctx->frame_info.action_type == P2P_ACTION_NOT_SUPPORT) &&
+	    !(wlan_vdev_mlme_feat_cap_get(vdev, WLAN_VDEV_F_SON) &&
+	      !tx_ctx->off_chan)) {
 		p2p_debug("drop action frame for SAP");
 		status = QDF_STATUS_E_FAILURE;
 	}
@@ -182,7 +184,9 @@ static QDF_STATUS p2p_vdev_check_valid(struct tx_action_context *tx_ctx)
 	    (tx_ctx->frame_info.sub_type == P2P_MGMT_ACTION) &&
 	    (tx_ctx->frame_info.public_action_type ==
 	     P2P_PUBLIC_ACTION_NOT_SUPPORT) &&
-	    (tx_ctx->frame_info.action_type == P2P_ACTION_NOT_SUPPORT)) {
+	    (tx_ctx->frame_info.action_type == P2P_ACTION_NOT_SUPPORT) &&
+	    !(wlan_vdev_mlme_feat_cap_get(vdev, WLAN_VDEV_F_SON) &&
+	      !tx_ctx->off_chan)) {
 		p2p_debug("drop action frame for SAP");
 		status = QDF_STATUS_E_FAILURE;
 	}

core/hdd/src/wlan_hdd_cfg80211.c

@@ -7208,7 +7208,8 @@ const struct nla_policy wlan_hdd_wifi_config_policy[
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_SCAN_DEFAULT_IES] = {.type = NLA_BINARY},
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_COMMAND] = {.type = NLA_U32},
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_VALUE] = {.type = NLA_U32},
-	[QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_DATA] = {.type = NLA_U32},
+	[QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_DATA] = {.type = NLA_BINARY,
+						      .len = 5000 },
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_LENGTH] = {.type = NLA_U32},
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_FLAGS] = {.type = NLA_U32},
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_IFINDEX] = {.type = NLA_U32},

os_if/son/src/os_if_son.c

@@ -1073,7 +1073,6 @@ u_int8_t os_if_son_get_rx_streams(struct wlan_objmgr_vdev *vdev)
 
 	return g_son_os_if_cb.os_if_get_rx_nss(vdev);
 }
-
 qdf_export_symbol(os_if_son_get_rx_streams);
 
 QDF_STATUS os_if_son_cfg80211_reply(qdf_nbuf_t sk_buf)
@@ -1589,11 +1588,12 @@ int os_if_son_parse_generic_nl_cmd(struct wiphy *wiphy,
 		param.value = nla_get_u32(tb
 				[QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_VALUE]);
 
-	if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_DATA])
+	if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_DATA]) {
 		param.data = nla_data(tb
 				[QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_DATA]);
 		param.data_len = nla_len(tb
 				[QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_DATA]);
+	}
 
 	if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_GENERIC_LENGTH])
 		param.length = nla_get_u32(tb