From 41d79906c3d480831b235e70b132d9a01d5eb467 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Mon, 2 Oct 2023 16:58:42 +0200 Subject: [PATCH] `rockchip64` + `sunxi*`: drivers_network: add patch for `uwe5622`, fixing build on 6.6.y --- .../compilation/patch/drivers_network.sh | 4 +++ ...driver-for-uwe5622-v6.6-fix-tty-sdio.patch | 27 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 patch/misc/wireless-driver-for-uwe5622-v6.6-fix-tty-sdio.patch diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh index 8abb6c2676..eb3df4fc52 100644 --- a/lib/functions/compilation/patch/drivers_network.sh +++ b/lib/functions/compilation/patch/drivers_network.sh @@ -669,6 +669,10 @@ driver_uwe5622_allwinner() { fi process_patch_file "${SRC}/patch/misc/wireless-driver-for-uwe5622-v6.1.patch" "applying" fi + + if linux-version compare "${version}" ge 6.6; then + process_patch_file "${SRC}/patch/misc/wireless-driver-for-uwe5622-v6.6-fix-tty-sdio.patch" "applying" + fi fi } diff --git a/patch/misc/wireless-driver-for-uwe5622-v6.6-fix-tty-sdio.patch b/patch/misc/wireless-driver-for-uwe5622-v6.6-fix-tty-sdio.patch new file mode 100644 index 0000000000..5c9574fdde --- /dev/null +++ b/patch/misc/wireless-driver-for-uwe5622-v6.6-fix-tty-sdio.patch @@ -0,0 +1,27 @@ +From 332748a389a88f8d78c5b2c70cf5c29f7098c703 Mon Sep 17 00:00:00 2001 +From: Ricardo Pardini +Date: Mon, 2 Oct 2023 16:24:12 +0200 +Subject: [PATCH] wifi uwe fix uwe5622 tty-sdio + +--- + drivers/net/wireless/uwe5622/tty-sdio/tty.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/uwe5622/tty-sdio/tty.c b/drivers/net/wireless/uwe5622/tty-sdio/tty.c +index 6498272fc192..36fc7dd558d4 100644 +--- a/drivers/net/wireless/uwe5622/tty-sdio/tty.c ++++ b/drivers/net/wireless/uwe5622/tty-sdio/tty.c +@@ -467,8 +467,8 @@ static int sdio_data_transmit(uint8_t *data, size_t count) + return mtty_write(NULL, data, count); + } + +-static int mtty_write_plus(struct tty_struct *tty, +- const unsigned char *buf, int count) ++static ssize_t mtty_write_plus(struct tty_struct *tty, const u8 *buf, ++ size_t count) + { + return sitm_write(buf, count, sdio_data_transmit); + } +-- +2.42.0 +