From patchwork Tue May 18 05:13:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1479944 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=AHTDvwfG; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ieW3jYb+; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FkkkF33Cjz9sW4 for ; Tue, 18 May 2021 15:16:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=iWX3aViCRJjsiTwOvDOKo+vSLKWvGZ5sdshz2jFJXrk=; b=AHTDvwfGKWkaDJfdInrpf6M7Hv t64B8oyIsjYxHcOd6/emsZ+jlqt+9/5dviPR75uvA6AOb1jhqiZzkMRPQONbJccW0if1+0RkILA1L Bgg1QKjLRCw/Le2ZBwEdhQNHjTFZlHIqoyExeUABfz3ml6cbqrRUHzjgvRYYRXvRTZ/bZfyDZ3Rzc L9kD2efEoBNjud2whUfEat/6z9O7FA43akIhWr2tZ/Jty2+gQhaYuyvXFbIbn6rM6X0bOYKqVh/2m lQRItOu9I/asVUKDgKkilSISQoJBAu2zIEi1WVBBNkULa/ArdhtwTxbDD4K1z/u52cvaiDsGane7G EPhRS/nw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lis3P-00GzF7-ES; Tue, 18 May 2021 05:14:04 +0000 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lis3K-00GzET-FD for openwrt-devel@lists.openwrt.org; Tue, 18 May 2021 05:14:01 +0000 Received: by mail-wm1-x333.google.com with SMTP id u4-20020a05600c00c4b02901774b80945cso689793wmm.3 for ; Mon, 17 May 2021 22:13:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=15dB6P4AN3q9EMFvxaBbt6LV9bwtPNan32/0oEo+jys=; b=ieW3jYb+u0+zEydxjJZUJJ6+n9GInlSYQm9JF4oGhn1dM2uuX6RgMnD/VfhIVWDsSY TeCFh39G3Zs8FYkOPPe6mCZvq5zM7sFRvet72heBVTDUyDAKm3UgTJC1GaYdkbHPJ45P vC3Uvcr8kCCv4miUu1WcpehVrDQMikJLLIEjk3IAKqH1gRMPEbgxqLKpXRwHqyQ04g7p WSSEf2vhsQ4OuJk/uf+qToy9W9fiBhsgViGLIEDefr87n7HdWZ2dshF8d+fqGFG4ZXIA 0lbbTCC+hmA1DPNCWvNhqSbcZie21h4kWKGoBN6N74YEmNl0Cg29fyNLiAy1kaG2ehYW R5cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=15dB6P4AN3q9EMFvxaBbt6LV9bwtPNan32/0oEo+jys=; b=GWuWK7BtQSPr6rSpVB7af9PIi+rjW/1KkNDoYWef1/H29ENdi8mHKwTYKuP9rK+W6l HWv91eXzxVMcAr9g8yGQb06YXRruEX1t4nFe7ObzYuIuS3P2edyhv5Cey54MvXtPHB/r GDE3Tsj3Ch6lej/zGrE4nJAyuWZc+5271M6a/zdwUuq4rJQ9Oie3SzhQtfpmaZZvehRS IrVR2ej0G4eR8+q0u7qSatgcmIuY6PYy//8hVtNYxGV8U2hHWuoZdYcyVMpV4KMgMuwc Nej4J4HLccDrmsr3CkxP25fqcMVMbB1S5LGiVw2PBGFDpJ5lvxTBDw0/vDAKkPi7Ksg4 cypA== X-Gm-Message-State: AOAM531MzMkWU7NaEbRLjw58KCmXJrakwwFoFFwCd1wKmZqFhdpIvkMs +73x7rCu8QtYvEdD998Y9PghP2neMtJ8dq7hYyA= X-Google-Smtp-Source: ABdhPJzNyMWeNQL61ffiLMu1He/mz6GRd/JYLO0JyGq9B/lu0UVq+/O05vhYup/yKrTojTT7lSrDgg== X-Received: by 2002:a7b:cb45:: with SMTP id v5mr3437354wmj.48.1621314837003; Mon, 17 May 2021 22:13:57 -0700 (PDT) Received: from mamamia.internal (a89-182-217-140.net-htp.de. [89.182.217.140]) by smtp.gmail.com with ESMTPSA id d3sm20104082wrs.41.2021.05.17.22.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 22:13:56 -0700 (PDT) From: Andre Heider To: openwrt-devel@lists.openwrt.org Cc: nbd@nbd.name Subject: [PATCH] iw: update to 8fab0c9e Date: Tue, 18 May 2021 07:13:50 +0200 Message-Id: <20210518051350.4012-1-a.heider@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_061358_691301_3BC25B14 X-CRM114-Status: GOOD ( 11.84 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "desiato.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This fixes `iw dev wlan0-mesh station dump`. 8fab0c9 iw: fix ftm_request missing arguments segfault e816fbc iw: fix mgmt dump missing arguments segfault 5d9d1b8 iw: Fix timestamp output on 32-bit architectures 4b25ae3 iw: fix pointer arithmetic [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:333 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This fixes `iw dev wlan0-mesh station dump`. 8fab0c9 iw: fix ftm_request missing arguments segfault e816fbc iw: fix mgmt dump missing arguments segfault 5d9d1b8 iw: Fix timestamp output on 32-bit architectures 4b25ae3 iw: fix pointer arithmetic in __print_he_capa c3df363 iw: add option to print human readable event time cd64525 iw: print ctrl port tx status event 0ba98b9 iw: use correct type in policy check for mesh 9e38dee iw: scan: fixup HE caps whitespace 17e8564 iw: scan: parse HE capabilities 5735e58 iw: util: factor out HE capability parser 6d8d507 iw: scan: add extension tag parsing b4e1ec4 man: update wikipage URL, reformat SEE ALSO section c56036a iw: enable 80MHz support for 6GHz band 11s mesh fa72728 iw: handle positive error codes gracefully 7ba9093 iw: scan: add flag for scanning colocated ap 5ec60ed iw: Add 'coloc' and 'flush' options to sched_scan f8ade75 iw: update wikipage URL b6f2dac iw: Add support for specifying the 160MHz bandwidth when setting the channel/frequency Signed-off-by: Andre Heider --- package/network/utils/iw/Makefile | 11 +++---- .../utils/iw/patches/200-reduce_size.patch | 30 +++++++++---------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/package/network/utils/iw/Makefile b/package/network/utils/iw/Makefile index 6db9aaf105..8e11046189 100644 --- a/package/network/utils/iw/Makefile +++ b/package/network/utils/iw/Makefile @@ -8,12 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iw -PKG_VERSION:=5.9 -PKG_RELEASE:=1 +PKG_VERSION:=5.9-8fab0c9e +PKG_RELEASE:=$(AUTORELEASE) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@KERNEL/software/network/iw -PKG_HASH:=293a07109aeb7e36267cf59e3ce52857e9ffae3a6666eb8ac77894b1839fe1f2 +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/jberg/iw.git +PKG_SOURCE_VERSION:=8fab0c9ee9db217587a58efcc37421c86edcb638 +PKG_MIRROR_HASH:=797b322bc03952f3127ae0a7da476c14ada1bbe9a9ae234a56dd6f864c568e16 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/iw/patches/200-reduce_size.patch b/package/network/utils/iw/patches/200-reduce_size.patch index af30876012..83e11405cb 100644 --- a/package/network/utils/iw/patches/200-reduce_size.patch +++ b/package/network/utils/iw/patches/200-reduce_size.patch @@ -1,6 +1,6 @@ --- a/event.c +++ b/event.c -@@ -944,6 +944,7 @@ static int print_event(struct nl_msg *ms +@@ -956,6 +956,7 @@ static int print_event(struct nl_msg *ms } switch (gnlh->cmd) { @@ -8,7 +8,7 @@ case NL80211_CMD_NEW_WIPHY: printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME])); break; -@@ -979,6 +980,7 @@ static int print_event(struct nl_msg *ms +@@ -991,6 +992,7 @@ static int print_event(struct nl_msg *ms case NL80211_CMD_SCHED_SCAN_RESULTS: printf("got scheduled scan results\n"); break; @@ -16,7 +16,7 @@ case NL80211_CMD_WIPHY_REG_CHANGE: case NL80211_CMD_REG_CHANGE: if (gnlh->cmd == NL80211_CMD_WIPHY_REG_CHANGE) -@@ -1061,6 +1063,7 @@ static int print_event(struct nl_msg *ms +@@ -1073,6 +1075,7 @@ static int print_event(struct nl_msg *ms mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); printf("del station %s\n", macbuf); break; @@ -24,7 +24,7 @@ case NL80211_CMD_JOIN_IBSS: mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); printf("IBSS %s joined\n", macbuf); -@@ -1254,9 +1257,9 @@ static int print_event(struct nl_msg *ms +@@ -1271,9 +1274,9 @@ static int print_event(struct nl_msg *ms case NL80211_CMD_CH_SWITCH_NOTIFY: parse_ch_switch_notify(tb, gnlh->cmd); break; @@ -134,7 +134,7 @@ { --- a/scan.c +++ b/scan.c -@@ -1297,6 +1297,9 @@ static void print_ht_op(const uint8_t ty +@@ -1306,6 +1306,9 @@ static void print_ht_op(const uint8_t ty printf("\t\t * secondary channel offset: %s\n", ht_secondary_offset[data[1] & 0x3]); printf("\t\t * STA channel width: %s\n", sta_chan_width[(data[1] & 0x4)>>2]); @@ -144,7 +144,7 @@ printf("\t\t * RIFS: %d\n", (data[1] & 0x8)>>3); printf("\t\t * HT protection: %s\n", protection[data[2] & 0x3]); printf("\t\t * non-GF present: %d\n", (data[2] & 0x4) >> 2); -@@ -1707,6 +1710,14 @@ static void print_ie(const struct ie_pri +@@ -1716,6 +1719,14 @@ static void print_ie(const struct ie_pri static const struct ie_print ieprinters[] = { [0] = { "SSID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), }, @@ -159,7 +159,7 @@ [1] = { "Supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), }, [3] = { "DS Parameter set", print_ds, 1, 1, BIT(PRINT_SCAN), }, [5] = { "TIM", print_tim, 4, 255, BIT(PRINT_SCAN), }, -@@ -1716,26 +1727,20 @@ static const struct ie_print ieprinters[ +@@ -1725,26 +1736,20 @@ static const struct ie_print ieprinters[ [32] = { "Power constraint", print_powerconstraint, 1, 1, BIT(PRINT_SCAN), }, [35] = { "TPC report", print_tpcreport, 2, 2, BIT(PRINT_SCAN), }, [42] = { "ERP", print_erp, 1, 255, BIT(PRINT_SCAN), }, @@ -187,15 +187,15 @@ }; static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data, -@@ -2279,6 +2284,7 @@ void print_ies(unsigned char *ie, int ie +@@ -2326,6 +2331,7 @@ void print_ies(unsigned char *ie, int ie ieprinters[ie[0]].flags & BIT(ptype)) { print_ie(&ieprinters[ie[0]], ie[0], ie[1], ie + 2, &ie_buffer); +#ifdef IW_FULL } else if (ie[0] == 221 /* vendor */) { print_vendor(ie[1], ie + 2, unknown, ptype); - } else if (unknown) { -@@ -2288,6 +2294,7 @@ void print_ies(unsigned char *ie, int ie + } else if (ie[0] == 255 /* extension */) { +@@ -2337,6 +2343,7 @@ void print_ies(unsigned char *ie, int ie for (i=0; i