From patchwork Fri Apr 9 04:25:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qingfang Deng X-Patchwork-Id: 1464173 X-Patchwork-Delegate: hauke@hauke-m.de 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=NS0GBDnM; 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=OA6UcF7c; 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 4FGlWW424Tz9sW1 for ; Fri, 9 Apr 2021 14:28:54 +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:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=nB4fgyhusS2nKAOiGX3MM4iyZsYxopxeNLy0fJeBQxc=; b=NS0GBDnMH+ovwB T/uIqvpXnV5OEWKQtFRTiM9d1sU+BXZR0mm48OiRhD2bleAEo6RMV09WHW5c37ITnUc6OAHfboZ3s twP1FL78RsiDT2c/dKky56usC42P8E0UprtZzirOn1eKhkL+Z6Kr17bImH1+cSkbHN9ZwMut+ZRz5 5cpGyFvXI1HJsOK/gCP7WQXcXyp8jUnJhvvQ2RhDvAYK4gCin6NMXww3t07R0mpHnMl4Bxn6YrArn RrfPdcsJab4dmk4nGXomDWg5lWXNEHMiByFPb39suuWeo1xoBRkLeCUVfd5qfj8wMRUlIShKaPjpM BLW/5Czrgkty762z0q7w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lUihw-00A1K9-4p; Fri, 09 Apr 2021 04:25:24 +0000 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lUiho-00A1Ir-Bt for openwrt-devel@lists.openwrt.org; Fri, 09 Apr 2021 04:25:20 +0000 Received: by mail-pj1-x102b.google.com with SMTP id ot17-20020a17090b3b51b0290109c9ac3c34so4322582pjb.4 for ; Thu, 08 Apr 2021 21:25:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=9+lYw8h42PLlpxzsiKvfHKHvsQhYgJeTqewlXoUohWE=; b=OA6UcF7cL6LfxrImATbSJG6YyYIIPckkCeQSntfgIu+fs57KiBSPfXp5sX8avIHkn3 zGKIatCF9e2WWeqW8VbpxUjFQRkOm2rwOI9qc2swlxr4lHvUvAnpUc84l1bTuvdrjbCG ynR6gRsqYLD1uxjV0SeslPEsJY2aoFBj15wvS65QLOZy/pB+d2zi6VpwdE7Yu9uGFWZJ o99mnHGDUb8f3WoAopKdMeWKwJMnaH8+0IwNa6CVZjB3MdEHOJihZ3t9ignVrFTpZk5H K3Dy/RfD6lRJqscTYK6I5WRpi9ScxuWUuxGXE5XxGBkFYgpAAyG2pSmDwkPTtByMY03n rXrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=9+lYw8h42PLlpxzsiKvfHKHvsQhYgJeTqewlXoUohWE=; b=Ts967sbgbYNSiwB2XDstypmxWzdlyLrgMfZexDLx0kMt2wm1rVG0Vm1AcIZxof4VYB xpnNpk7v2t9/YnfWJhUtpX/sZgvlQaTaqL8/CH4qHULMnXj+5fiKCl/NBI+ai5a112WN jkysfWxc1tz3t47gHH3eELmfrp1nPaYR55lYuJs9OMlKaA8iAd3uaETGcpPWe3BfNKTQ 40XBthPDppLaKxGrJn2OeQiuquj9EvJY5qKt/fqV2DMcQpvtLlhlXh+QzKpo0WqgEzOI jNr9oWTkDC5U8hAdHxLtO8qsSAxC+c9ZF781bVzPvc5FT3mxf7+T1tLoXHHpMlGlBLss WMyg== X-Gm-Message-State: AOAM533sC5Jha4BwlU9gt7tFMJBObsqMjr+81ebZ7mOTBACSULxheu9T Hffso+wWSmNzV53XtLG5lnUBWI8U91x0TA== X-Google-Smtp-Source: ABdhPJzVYn0MczN3NM8I1c7P5zyij2bUrsh1BkrFr3/E2OcFqWx40oPTgd5RLtT/QrYACLOTZRvWyA== X-Received: by 2002:a17:90b:374a:: with SMTP id ne10mr11845319pjb.102.1617942314091; Thu, 08 Apr 2021 21:25:14 -0700 (PDT) Received: from localhost.localdomain ([138.197.212.246]) by smtp.gmail.com with ESMTPSA id q9sm923430pfn.19.2021.04.08.21.25.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 21:25:13 -0700 (PDT) From: DENG Qingfang To: openwrt-devel@lists.openwrt.org Subject: [PATCH] kernel/modules: move act_gact into kmod-sched-core Date: Fri, 9 Apr 2021 12:25:08 +0800 Message-Id: <20210409042508.2533395-1-dqfext@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210409_052518_659738_1ABFC213 X-CRM114-Status: UNSURE ( 8.90 ) X-CRM114-Notice: Please train this message. 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: As the name suggests, act_gact has the generic actions such as dropping and accepting packets, so move it into kmod-sched-core. Signed-off-by: DENG Qingfang --- package/kernel/linux/modules/netsupport.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 [2607:f8b0:4864:20:0:0:0:102b listed in] [list.dnswl.org] 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 [dqfext[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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 As the name suggests, act_gact has the generic actions such as dropping and accepting packets, so move it into kmod-sched-core. Signed-off-by: DENG Qingfang --- package/kernel/linux/modules/netsupport.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 7237b65303..ae6a2f52b9 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -721,7 +721,7 @@ $(eval $(call KernelPackage,mppe)) SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko)) -SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit cls_matchall +SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_gact act_mirred act_skbedit cls_matchall SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark act_ctinfo sch_cake sch_netem sch_mqprio em_ipset cls_bpf cls_flower act_bpf act_vlan act_nat SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES)) SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES))) @@ -745,6 +745,7 @@ define KernelPackage/sched-core CONFIG_NET_CLS_ROUTE4 \ CONFIG_NET_CLS_TCINDEX \ CONFIG_NET_CLS_U32 \ + CONFIG_NET_ACT_GACT \ CONFIG_NET_ACT_MIRRED \ CONFIG_NET_ACT_SKBEDIT \ CONFIG_NET_CLS_MATCHALL \ @@ -909,7 +910,6 @@ define KernelPackage/sched CONFIG_NET_SCH_FQ \ CONFIG_NET_SCH_PIE \ CONFIG_NET_ACT_POLICE \ - CONFIG_NET_ACT_GACT \ CONFIG_NET_ACT_IPT \ CONFIG_NET_ACT_PEDIT \ CONFIG_NET_ACT_SIMP \