[oe] [meta-oe] [PATCH] iwd: upgrade 1.18 -> 1.19

[oe] [meta-oe] [PATCH] iwd: upgrade 1.18 -> 1.19

[Wang Mingyu]

0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch
removed since it is included in 1.19

ver 1.19:
  Fix issue with handling OCV if offloading is supported.
  Fix issue with handling SA Query on channel switch event.
  Fix issue with starting FT-over-DS actions after roaming.
  Add support for OWE transition networks.
  Add support for extended key IDs.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...6_addr-instead-of-__in6_u.__u6_addr8.patch | 38 -------------------
 .../iwd/{iwd_1.18.bb => iwd_1.19.bb}          |  5 +--
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch
 rename meta-oe/recipes-connectivity/iwd/{iwd_1.18.bb => iwd_1.19.bb} (89%)

diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch
deleted file mode 100644
index a9f2393532..0000000000
--- a/meta-oe/recipes-connectivity/iwd/iwd/0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 36c74f974eba6f276ed4dd04c2077e6f23ebec37 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 17 Oct 2021 16:09:03 -0700
-Subject: [PATCH] netconfig: Use s6_addr instead of __in6_u.__u6_addr8
-
-Building fails with:
-
-../iwd-1.18/src/netconfig.c: In function 'netconfig_ipv6_to_string':
-../iwd-1.18/src/netconfig.c:188:25: error: 'struct in6_addr' has no member named '__in6_u'; did you mean '__in6_union'?
-  188 |         memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16);
-      |                         ^~~~~~~
-      |                         __in6_union
-
-Can be fixed by changing &this_ip.__in6_u.__u6_addr8[0] with &this_ip.s6_addr[0].
-For references: in6_addr is declared in /usr/include/linux/in6.h
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/netconfig.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/netconfig.c b/src/netconfig.c
-index c748630..ab51c3d 100644
---- a/src/netconfig.c
-+++ b/src/netconfig.c
-@@ -185,7 +185,7 @@ static inline char *netconfig_ipv6_to_string(const uint8_t *addr)
- 	struct in6_addr in6_addr;
- 	char *addr_str = l_malloc(INET6_ADDRSTRLEN);
- 
--	memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16);
-+	memcpy(in6_addr.s6_addr, addr, 16);
- 
- 	if (L_WARN_ON(unlikely(!inet_ntop(AF_INET6, &in6_addr, addr_str,
- 						INET6_ADDRSTRLEN)))) {
--- 
-2.33.1
-
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.18.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.19.bb
similarity index 89%
rename from meta-oe/recipes-connectivity/iwd/iwd_1.18.bb
rename to meta-oe/recipes-connectivity/iwd/iwd_1.19.bb
index 4136de84fa..219dffe09b 100644
--- a/meta-oe/recipes-connectivity/iwd/iwd_1.18.bb
+++ b/meta-oe/recipes-connectivity/iwd/iwd_1.19.bb
@@ -7,9 +7,8 @@ DEPENDS = "ell"
 
 SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \
            file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \
-           file://0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch \
-          "
-SRC_URI[sha256sum] = "0225ab81579f027e0fcbf255517f432fcf355d14f3645c36813c71a441dfab55"
+           "
+SRC_URI[sha256sum] = "dd65a8795f6127fb1b9e29f2092686b0590a0d3738c2b90c792ccd320deaf966"
 
 inherit autotools manpages pkgconfig python3native systemd
 
-- 
2.25.1