Remove redundant intermediate reason string copy.

Bug:188488064
Bug:258271661
Test: Verified on hikey960 platform.

Signed-off-by: ajay <ajay.davanageri@broadcom.corp-partner.google.com>
Change-Id: I12477f60f802f2280a5b01ac8b04dfa842924345
(cherry picked from commit d47e19c5f1ebc2a972690bce32065aaf020f5622)
Signed-off-by: Necip Fazil Yildiran <necip@google.com>

2 files changed, 10 insertions, 43 deletions

diff --git a/net/wireless/bcmdhd/wl_cfgnan.c b/net/wireless/bcmdhd/wl_cfgnan.c
index 6b6c372..d50e642 100644
--- a/net/wireless/bcmdhd/wl_cfgnan.c
+++ b/net/wireless/bcmdhd/wl_cfgnan.c
@@ -3098,12 +3098,6 @@ wl_cfgnan_send_stop_event(struct bcm_cfg80211 *cfg)
 	bzero(nan_event_data, sizeof(nan_event_data_t));
 
 	nan_event_data->status = NAN_STATUS_SUCCESS;
-	ret = memcpy_s(nan_event_data->nan_reason, NAN_ERROR_STR_LEN,
-			"NAN_STATUS_SUCCESS", strlen("NAN_STATUS_SUCCESS"));
-	if (ret != BCME_OK) {
-		WL_ERR(("Failed to copy nan reason string, ret = %d\n", ret));
-		goto exit;
-	}
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || defined(WL_VENDOR_EXT_SUPPORT)
 	ret = wl_cfgvendor_send_nan_event(cfg->wdev->wiphy, bcmcfg_to_prmry_ndev(cfg),
 			GOOGLE_NAN_EVENT_DISABLED, nan_event_data);
@@ -8169,24 +8163,8 @@ wl_cfgnan_notify_nan_status(struct bcm_cfg80211 *cfg,
 				pev->reason == NAN_TERM_REASON_USER_REQ ||
 				pev->reason == NAN_TERM_REASON_COUNT_REACHED) {
 			nan_event_data->status = NAN_STATUS_SUCCESS;
-			ret = memcpy_s(nan_event_data->nan_reason,
-				sizeof(nan_event_data->nan_reason),
-				"NAN_STATUS_SUCCESS",
-				strlen("NAN_STATUS_SUCCESS"));
-			if (ret != BCME_OK) {
-				WL_ERR(("Failed to copy nan_reason\n"));
-				goto exit;
-			}
 		} else {
 			nan_event_data->status = NAN_STATUS_INTERNAL_FAILURE;
-			ret = memcpy_s(nan_event_data->nan_reason,
-				sizeof(nan_event_data->nan_reason),
-				"NAN_STATUS_INTERNAL_FAILURE",
-				strlen("NAN_STATUS_INTERNAL_FAILURE"));
-			if (ret != BCME_OK) {
-				WL_ERR(("Failed to copy nan_reason\n"));
-				goto exit;
-			}
 		}
 
 		if (pev->svctype == NAN_SC_SUBSCRIBE) {
@@ -8221,14 +8199,6 @@ wl_cfgnan_notify_nan_status(struct bcm_cfg80211 *cfg,
 			WL_INFORM_MEM(("TXS success for type %s(%d) token %d\n",
 				nan_frm_type_to_str(txs->type), txs->type, txs->host_seq));
 			nan_event_data->status = NAN_STATUS_SUCCESS;
-			ret = memcpy_s(nan_event_data->nan_reason,
-				sizeof(nan_event_data->nan_reason),
-				"NAN_STATUS_SUCCESS",
-				strlen("NAN_STATUS_SUCCESS"));
-			if (ret != BCME_OK) {
-				WL_ERR(("Failed to copy nan_reason\n"));
-				goto exit;
-			}
 		} else {
 			/* TODO : populate status based on reason codes
 			For now adding it as no ACK, so that app/framework can retry
@@ -8237,14 +8207,6 @@ wl_cfgnan_notify_nan_status(struct bcm_cfg80211 *cfg,
 				nan_frm_type_to_str(txs->type), txs->type, txs->status,
 				txs->host_seq));
 			nan_event_data->status = NAN_STATUS_NO_OTA_ACK;
-			ret = memcpy_s(nan_event_data->nan_reason,
-				sizeof(nan_event_data->nan_reason),
-				"NAN_STATUS_NO_OTA_ACK",
-				strlen("NAN_STATUS_NO_OTA_ACK"));
-			if (ret != BCME_OK) {
-				WL_ERR(("Failed to copy nan_reason\n"));
-				goto exit;
-			}
 		}
 		nan_event_data->reason = txs->reason_code;
 		nan_event_data->token = txs->host_seq;
diff --git a/net/wireless/bcmdhd/wl_cfgvendor.c b/net/wireless/bcmdhd/wl_cfgvendor.c
index 9558b35..7b3926f 100644
--- a/net/wireless/bcmdhd/wl_cfgvendor.c
+++ b/net/wireless/bcmdhd/wl_cfgvendor.c
@@ -5220,14 +5220,16 @@ wl_cfgvendor_nan_tx_followup_ind_event_data_filler(struct sk_buff *msg,
 	}
 	if (event_data->status == NAN_STATUS_SUCCESS) {
 		ret = nla_put(msg, NAN_ATTRIBUTE_REASON,
-				strlen("NAN_STATUS_SUCCESS"), event_data->nan_reason);
+			strlen("NAN_STATUS_SUCCESS"),
+				"NAN_STATUS_SUCCESS");
 		if (unlikely(ret)) {
 			WL_ERR(("Failed to put nan reason, ret=%d\n", ret));
 			goto fail;
 		}
 	} else {
 		ret = nla_put(msg, NAN_ATTRIBUTE_REASON,
-				strlen("NAN_STATUS_NO_OTA_ACK"), event_data->nan_reason);
+			strlen("NAN_STATUS_NO_OTA_ACK"),
+				"NAN_STATUS_NO_OTA_ACK");
 		if (unlikely(ret)) {
 			WL_ERR(("Failed to put nan reason, ret=%d\n", ret));
 			goto fail;
@@ -5269,14 +5271,16 @@ wl_cfgvendor_nan_svc_terminate_event_filler(struct sk_buff *msg,
 	}
 	if (event_data->status == NAN_STATUS_SUCCESS) {
 		ret = nla_put(msg, NAN_ATTRIBUTE_REASON,
-				strlen("NAN_STATUS_SUCCESS"), event_data->nan_reason);
+			strlen("NAN_STATUS_SUCCESS"),
+				"NAN_STATUS_SUCCESS");
 		if (unlikely(ret)) {
 			WL_ERR(("Failed to put nan reason, ret=%d\n", ret));
 			goto fail;
 		}
 	} else {
 		ret = nla_put(msg, NAN_ATTRIBUTE_REASON,
-				strlen("NAN_STATUS_INTERNAL_FAILURE"), event_data->nan_reason);
+			strlen("NAN_STATUS_INTERNAL_FAILURE"),
+				"NAN_STATUS_INTERNAL_FAILURE");
 		if (unlikely(ret)) {
 			WL_ERR(("Failed to put nan reason, ret=%d\n", ret));
 			goto fail;
@@ -5727,7 +5731,8 @@ wl_cfgvendor_send_nan_event(struct wiphy *wiphy, struct net_device *dev,
 			goto fail;
 		}
 		ret = nla_put(msg, NAN_ATTRIBUTE_REASON,
-			strlen("NAN_STATUS_SUCCESS"), event_data->nan_reason);
+			strlen("NAN_STATUS_SUCCESS"),
+				"NAN_STATUS_SUCCESS");
 		if (unlikely(ret)) {
 			WL_ERR(("Failed to put reason code, ret=%d\n", ret));
 			goto fail;