commit ad16a8806219b005c86e4abaa7ad0d4ffcc9f523
author Pamidipati, Vijay <vpamidip@codeaurora.org> Tue Nov 29 01:44:25 2016 +0530
committer qcabuildsw <qcabuildsw@localhost> Tue Dec 06 13:18:21 2016 -0800
tree 69a0253c7c1405a903590876d7c728c88e2cd21f
parent 1dcabaf049586f09cab154a4c43ab1ccb86136ee

qcacmn: Fix mac address value sent in peer assoc WMI command

Copy MAC Address in 2 word format in WMI message from char array input

CRs-Fixed: 1088985
Change-Id: I36e4e806b9c027ee824c77ca692239c7752b8036

wmi_unified_tlv.c

diff --git a/wmi_unified_tlv.c b/wmi_unified_tlv.c
index 8bf2b61..1668838 100644
--- a/wmi_unified_tlv.c
+++ b/wmi_unified_tlv.c
@@ -586,6 +586,9 @@
 	case WMI_HOST_PEER_SET_MIN_TX_RATE:
 		*targ_paramid = WMI_PEER_SET_MIN_TX_RATE;
 		break;
+	case WMI_HOST_PEER_SET_DEFAULT_ROUTING:
+		*targ_paramid = WMI_PEER_SET_DEFAULT_ROUTING;
+		break;
 	default:
 		return QDF_STATUS_E_NOSUPPORT;
 	}
@@ -1663,6 +1666,24 @@
 		cmd->peer_flags &= ~WMI_PEER_HT;
 }
 #endif
+
+#ifdef CONFIG_MCL
+static inline void copy_peer_mac_addr_tlv(
+		wmi_peer_assoc_complete_cmd_fixed_param * cmd,
+		struct peer_assoc_params *param)
+{
+	qdf_mem_copy(&cmd->peer_macaddr, &param->peer_macaddr,
+			sizeof(param->peer_macaddr));
+}
+#else
+static inline void copy_peer_mac_addr_tlv(
+		wmi_peer_assoc_complete_cmd_fixed_param * cmd,
+		struct peer_assoc_params *param)
+{
+	WMI_CHAR_ARRAY_TO_MAC_ADDR(param->peer_mac, &cmd->peer_macaddr);
+}
+#endif
+
 /**
  *  send_peer_assoc_cmd_tlv() - WMI peer assoc function
  *  @param wmi_handle      : handle to WMI.
@@ -1706,11 +1727,13 @@
 			       (wmi_peer_assoc_complete_cmd_fixed_param));
 
 	cmd->vdev_id = param->vdev_id;
-	qdf_mem_copy(&cmd->peer_macaddr, &param->peer_macaddr,
-				 sizeof(param->peer_macaddr));
+
 	cmd->peer_new_assoc = param->peer_new_assoc;
 	cmd->peer_associd = param->peer_associd;
+
 	copy_peer_flags_tlv(cmd, param);
+	copy_peer_mac_addr_tlv(cmd, param);
+
 	cmd->peer_rate_caps = param->peer_rate_caps;
 	cmd->peer_caps = param->peer_caps;
 	cmd->peer_listen_intval = param->peer_listen_intval;