Received: by 2002:a05:7412:da14:b0:e2:908c:2ebd with SMTP id fe20csp1657232rdb; Sun, 8 Oct 2023 19:54:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGyklm5VL7/hUPVIP1TZuREnbz+ss20xufZ4CaeJzCjaIQvIFDUiLf8hOzPXzcWa1LuGiOy X-Received: by 2002:a05:6a20:4405:b0:16b:9f9b:5764 with SMTP id ce5-20020a056a20440500b0016b9f9b5764mr8623362pzb.54.1696820090721; Sun, 08 Oct 2023 19:54:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696820090; cv=none; d=google.com; s=arc-20160816; b=eV1G5DSEz5PqadpuAKYVbxL0Nv8HeMEgENJOQB/wiPF4UT0q/nEBaoRPT8DbTFPEGA zFBPvy9WOeMAC9d1+xUq7BSRauHkRJu73LU6XpvTzZ0q1ANkldiHoDJSAz7BmuQAy7Tk 0Nsj9f8lBWflYCJ8m5r0XnMX5YbOE3MN6T43NfhMOieL+wDjU75Zg5EFyq9ucI9HBC2D TMZWsPA9iWalbVJHaOQgblqkM5yslM3wbXxHinm3K+kCnoSa+qWi+KdadhlB9+ryem8/ qIfWTcW8MELldCrBTteD+JQ+OgLJGOWKuq2ZbsHqIJ88/tJkl7N+R/7S5c9+3zZ7y2g+ rBlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=NkE7td8c3m8wAZFEaUUHUQxSCqvvJunxsM87dNhaIMI=; fh=FPbhfoVB16gLUGeHHFPktjFy+wHYtzngLnQpm9tReUI=; b=Rb0AJ4/fQGYEK+yHeyhnVt/TH8u+UYdjXbt2YRlepWyH63O+aKI+AxiK1oDKgieZqF tQrtC7pT9f5ilBp5eVfGu4h1jZsO3PlUNW25eFv1CKux30beNmiKwXzEfkWRSjKagHKB zekiHBpqi+l5iUExKaZd5D33KwXnIpOf5LlqVSLvU5StujLo5XaA5TJfskb6fkxQVzgn VoQKF2U6FXSbRz/xk/WzbQvvtGEIYtqamttfneoqfLYyM+FCaoT9kAGVD8pkS5TTQppz XUws7MEU1wUZAmVYCjeIE+gCfo60+9YXefvZeDEp36rTfO1niB8y/K/VQ+4UcfFaEjUB qxRg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id w5-20020a170902ca0500b001c342073f76si8152445pld.323.2023.10.08.19.54.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 19:54:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 54EB5807DE28; Sun, 8 Oct 2023 19:54:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232267AbjJICyg (ORCPT + 99 others); Sun, 8 Oct 2023 22:54:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230429AbjJICyf (ORCPT ); Sun, 8 Oct 2023 22:54:35 -0400 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92388A4; Sun, 8 Oct 2023 19:54:33 -0700 (PDT) X-UUID: 32ffd98f3bf5458f9196de2ce6920fc6-20231009 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.32,REQID:5774f625-9af4-41ad-8b8e-617d319afdd0,IP:-15 ,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:-5,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:-20 X-CID-INFO: VERSION:1.1.32,REQID:5774f625-9af4-41ad-8b8e-617d319afdd0,IP:-15,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:-5,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-20 X-CID-META: VersionHash:5f78ec9,CLOUDID:6fb8b8bf-14cc-44ca-b657-2d2783296e72,B ulkID:231009105417AZF97K5Y,BulkQuantity:0,Recheck:0,SF:100|17|19|42|101|24 |102,TC:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil ,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_FSD,TF_CID_SPAM_FSI,TF_CID_SPAM_SNR,TF_CID_SPAM_FAS X-UUID: 32ffd98f3bf5458f9196de2ce6920fc6-20231009 X-User: guodongtai@kylinos.cn Received: from localhost.localdomain [(39.156.73.14)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 260471370; Mon, 09 Oct 2023 10:54:16 +0800 From: George Guo To: fw@strlen.de Cc: coreteam@netfilter.org, davem@davemloft.net, dongtai.guo@linux.dev, edumazet@google.com, guodongtai@kylinos.cn, kadlec@netfilter.org, kuba@kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, pabeni@redhat.com, pablo@netfilter.org Subject: [PATCH v2] netfilter: cleanup struct nft_table Date: Mon, 9 Oct 2023 10:55:48 +0800 Message-Id: <20231009025548.3522409-1-guodongtai@kylinos.cn> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231007105335.GB20662@breakpoint.cc> References: <20231007105335.GB20662@breakpoint.cc> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Sun, 08 Oct 2023 19:54:48 -0700 (PDT) X-Spam-Level: ** Add comments for nlpid, family, udlen and udata in struct nft_table, and afinfo is no longer a member of struct nft_table, so remove the comment for it. Signed-off-by: George Guo --- include/net/netfilter/nf_tables.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h index 7c816359d5a9..9fb16485d08f 100644 --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h @@ -1198,10 +1198,13 @@ static inline void nft_use_inc_restore(u32 *use) * @hgenerator: handle generator state * @handle: table handle * @use: number of chain references to this table + * @family:address family * @flags: table flag (see enum nft_table_flags) * @genmask: generation mask - * @afinfo: address family info + * @nlpid: netlink port ID * @name: name of the table + * @udlen: length of the user data + * @udata: user data * @validate_state: internal, set when transaction adds jumps */ struct nft_table { -- 2.34.1