Эх сурвалжийг харах

qcacld-3.0: Use a conditional macro for NLA_EXACT_LEN

Since 5.10 kernel has removed NLA_EXACT_LEN, replace NLA_EXACT_LEN
usage with a new conditionally defined macro for it.

Change-Id: I700f40d9ff87331dbb23a44fcbe6e4a586ef286d
CRs-Fixed: 2849795
Alan Chen 4 жил өмнө
parent
commit
f1918032a5

+ 5 - 9
core/hdd/src/wlan_hdd_subnet_detect.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2021 The Linux Foundation. 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
@@ -45,14 +45,10 @@ const struct nla_policy subnet_detect_policy[
 			QCA_WLAN_VENDOR_ATTR_GW_PARAM_CONFIG_MAX + 1] = {
 		[QCA_WLAN_VENDOR_ATTR_GW_PARAM_CONFIG_GW_MAC_ADDR] =
 				VENDOR_NLA_POLICY_MAC_ADDR,
-		[QCA_WLAN_VENDOR_ATTR_GW_PARAM_CONFIG_IPV4_ADDR] = {
-				.type = NLA_EXACT_LEN,
-				.len = QDF_IPV4_ADDR_SIZE
-		},
-		[QCA_WLAN_VENDOR_ATTR_GW_PARAM_CONFIG_IPV6_ADDR] = {
-				.type = NLA_EXACT_LEN,
-				.len = QDF_IPV6_ADDR_SIZE
-		},
+		[QCA_WLAN_VENDOR_ATTR_GW_PARAM_CONFIG_IPV4_ADDR] =
+				VENDOR_NLA_POLICY_IPV4_ADDR,
+		[QCA_WLAN_VENDOR_ATTR_GW_PARAM_CONFIG_IPV6_ADDR] =
+				VENDOR_NLA_POLICY_IPV6_ADDR,
 };
 
 /**

+ 3 - 5
os_if/nan/src/os_if_nan.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2021 The Linux Foundation. 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
@@ -153,10 +153,8 @@ const struct nla_policy vendor_attr_policy[
 						.type = NLA_U32,
 						.len = sizeof(uint32_t)
 	},
-	[QCA_WLAN_VENDOR_ATTR_NDP_IPV6_ADDR] = {
-						.type = NLA_EXACT_LEN,
-						.len = QDF_IPV6_ADDR_SIZE
-	},
+	[QCA_WLAN_VENDOR_ATTR_NDP_IPV6_ADDR] =
+				VENDOR_NLA_POLICY_IPV6_ADDR,
 	[QCA_WLAN_VENDOR_ATTR_NDP_TRANSPORT_PORT] = {
 						.type = NLA_U16,
 						.len = sizeof(uint16_t)