2 files changed, 2 insertions, 58 deletions

diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-core-net-Remove-unused-variable.patch b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-core-net-Remove-unused-variable.patch
deleted file mode 100644
index d648c284b5..0000000000
--- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-core-net-Remove-unused-variable.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From cfa40cc1c2df6c64fb53bb4a2a56eb09e3e1309c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 4 Jun 2021 18:21:58 -0700
-Subject: [PATCH] core-net: Remove unused variable
-
-variable 'n' is being set but it is not used anywhere, latest clang is
-able to detect this and flags it
-
-Fixes
-
-lib/core-net/route.c:41:6: error: variable 'n' set but not used [-Werror,-Wunused-but-set-variable]
-|         int n = 0;
-|             ^
-
-Upstream-Status: Submitted [https://github.com/warmcat/libwebsockets/pull/2320]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/core-net/route.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/lib/core-net/route.c b/lib/core-net/route.c
-index efe08ba1..6be93d62 100644
---- a/lib/core-net/route.c
-+++ b/lib/core-net/route.c
-@@ -38,23 +38,22 @@ void
- _lws_routing_entry_dump(lws_route_t *rou)
- {
-        char sa[48], fin[192], *end = &fin[sizeof(fin)];
--       int n = 0;
- 
-        if (rou->dest.sa4.sin_family) {
-                lws_sa46_write_numeric_address(&rou->dest, sa, sizeof(sa));
--               n += lws_snprintf(fin, lws_ptr_diff_size_t(end, fin),
-+               lws_snprintf(fin, lws_ptr_diff_size_t(end, fin),
-                                  "dst: %s/%d, ", sa, rou->dest_len);
-        }
- 
-        if (rou->src.sa4.sin_family) {
-                lws_sa46_write_numeric_address(&rou->src, sa, sizeof(sa));
--               n += lws_snprintf(fin, lws_ptr_diff_size_t(end, fin),
-+               lws_snprintf(fin, lws_ptr_diff_size_t(end, fin),
-                                  "src: %s/%d, ", sa, rou->src_len);
-        }
- 
-        if (rou->gateway.sa4.sin_family) {
-                lws_sa46_write_numeric_address(&rou->gateway, sa, sizeof(sa));
--               n += lws_snprintf(fin, lws_ptr_diff_size_t(end, fin),
-+               lws_snprintf(fin, lws_ptr_diff_size_t(end, fin),
-                                  "gw: %s, ", sa);
-        }
- 
--- 
-2.31.1
-
diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.0.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb
index 18b72ae8f5..685aebee59 100644
--- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.0.bb
+++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb
@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c8bea43a2eb5d713c338819a0be07797"
 DEPENDS = "zlib"
 
 S = "${WORKDIR}/git"
-SRCREV = "4b6a7982b6833c8ccac1f35caaf9e8ccc605ff9a"
-SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.2-stable \
-           file://0001-core-net-Remove-unused-variable.patch \
-          "
+SRCREV = "8a580b59b23d204ca72028370e97a8f6aa0c9202"
+SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.2-stable"
 
 UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"