qcacld-3.0: Fix the FW version in bugreport

The firmware version sub id is not included in the current Bugreport.
Including subid and HW version.

Change-Id: Idc96c15d377935e0ff7291b5542ef34627613136
CRs-Fixed: 2034277

core/hdd/src/wlan_hdd_cfg80211.c

@@ -4196,7 +4196,9 @@ __wlan_hdd_cfg80211_get_wifi_info(struct wiphy *wiphy,
 	struct nlattr *tb_vendor[QCA_WLAN_VENDOR_ATTR_WIFI_INFO_GET_MAX + 1];
 	tSirVersionString driver_version;
 	tSirVersionString firmware_version;
+	const char *hw_version;
 	uint32_t major_spid = 0, minor_spid = 0, siid = 0, crmid = 0;
+	uint32_t sub_id = 0;
 	int status;
 	struct sk_buff *reply_skb;
 	uint32_t skb_len = 0, count = 0;
@@ -4230,8 +4232,11 @@ __wlan_hdd_cfg80211_get_wifi_info(struct wiphy *wiphy,
 		hdd_debug("Rcvd req for FW version");
 		hdd_get_fw_version(hdd_ctx, &major_spid, &minor_spid, &siid,
 				   &crmid);
+		sub_id = (hdd_ctx->target_fw_vers_ext & 0xf0000000) >> 28;
+		hw_version = hdd_ctx->target_hw_name;
 		snprintf(firmware_version, sizeof(firmware_version),
-			 "%d:%d:%d:%d", major_spid, minor_spid, siid, crmid);
+			"FW:%d.%d.%d.%d.%d HW:%s", major_spid, minor_spid,
+			siid, crmid, sub_id, hw_version);
 		skb_len += strlen(firmware_version) + 1;
 		count++;
 	}