Received: from mail.netfilter.org (mail.netfilter.org [217.70.190.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA9D522A4E9 for ; Wed, 29 Jul 2026 11:49:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.190.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785325795; cv=none; b=f4eKOpuW5ha/UptuNgoAR4iFecfoo5d0c8Dg0VH/IEf0e7X13inoDxb2zgWm2snFgUOvJ9OSo+t/N9ByTC3N6Cy5PlsqlUxz6cv1bNSP9fosc24pPvq8kMG9L9V1Ql4Y4ZdkkX4cBzH+Ag9hMe+BwRB3HtyLsFJ2PJ+eP1Y4o8A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785325795; c=relaxed/simple; bh=Vj8t+7m6N5QKVxLOn2tddpTSAz+wK0NgXEl/WpluZc0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=Wv8LmEYIYJhyVuyJoambz/W3Wtwsf2rttY/00612aObYg7SvMMhudDd5bEJjFY6w5NWnXHTLEJcL0lpH3ZHF1i0qpY8k7Ph1zVxi8kVXnoH6P6a2wzZUpIpGDwmzPlBi1U4zQRm7Q1wGIYxAWjXvjDniRCZsQmKb4XIXVfte/OA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org; spf=pass smtp.mailfrom=netfilter.org; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b=jLlWN+of; arc=none smtp.client-ip=217.70.190.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=netfilter.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b="jLlWN+of" Received: from localhost.localdomain (mail-agni [217.70.190.124]) by mail.netfilter.org (Postfix) with ESMTPSA id 1E8DA60192 for ; Wed, 29 Jul 2026 13:49:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org; s=2025; t=1785325791; bh=UkXTGzy0Qk6vttWCi/M+1pdU6bBgs5E0P8S4WkOytkU=; h=From:To:Subject:Date:From; b=jLlWN+ofU8cNF1oYKeqpT4pUxD0Jj9W42RfiFmnquVs49l2I9vI9/dPZbZk4Hoek9 9phGNTvpby3FL3skkePHB0f89IXbYyeBvqnskS7GpLVUHrKDgthkLl19hfd08n2Wm9 8MkCcqCIcV9Pte76ehmocmUspgwRgFJNOXN+nkuXbG3HMe/cgxEzKRouJhkhCfAjWh FhyOzJVLPYrgPEGjVmZIAFNf2XT7WEc5yb8KjqtkSLg3DYrtcaFrSJrPxcTk4h3lOD 55oz5hMiQiJ+1cwzzsg87gX/Hy26V4vRun2r9y6vdDi51pkxlY16ahZAZ4FlbpenYX vbtfiOGFqcnRg== From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nf-next,v5 1/6] netfilter: flowtable: consolidate net_device field in nft_forward_info struct Date: Wed, 29 Jul 2026 13:49:42 +0200 Message-ID: <20260729114947.403782-1-pablo@netfilter.org> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit info->indev and info->outdev refer to the same device, a single info->dev field is sufficient. While at it, remove unused router parameter from the flowtable path discovery function. Acked-by: Lorenzo Bianconi Signed-off-by: Pablo Neira Ayuso --- v5: no changes net/netfilter/nf_flow_table_path.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/net/netfilter/nf_flow_table_path.c b/net/netfilter/nf_flow_table_path.c index 98c03b487f52..261bb44d08eb 100644 --- a/net/netfilter/nf_flow_table_path.c +++ b/net/netfilter/nf_flow_table_path.c @@ -42,8 +42,7 @@ static bool nft_is_valid_ether_device(const struct net_device *dev) return true; } -static int nft_dev_fill_forward_path(const struct nf_flow_route *route, - const struct dst_entry *dst_cache, +static int nft_dev_fill_forward_path(const struct dst_entry *dst_cache, const struct nf_conn *ct, enum ip_conntrack_dir dir, u8 *ha, struct net_device_path_stack *stack) @@ -76,8 +75,7 @@ static int nft_dev_fill_forward_path(const struct nf_flow_route *route, } struct nft_forward_info { - const struct net_device *indev; - const struct net_device *outdev; + const struct net_device *dev; struct id { __u16 id; __be16 proto; @@ -109,7 +107,7 @@ static int nft_dev_path_info(const struct net_device_path_stack *stack, case DEV_PATH_VLAN: case DEV_PATH_PPPOE: case DEV_PATH_TUN: - info->indev = path->dev; + info->dev = path->dev; if (is_zero_ether_addr(info->h_source)) memcpy(info->h_source, path->dev->dev_addr, ETH_ALEN); @@ -179,10 +177,9 @@ static int nft_dev_path_info(const struct net_device_path_stack *stack, return -1; } } - info->outdev = info->indev; if (nf_flowtable_hw_offload(flowtable) && - nft_is_valid_ether_device(info->indev)) + nft_is_valid_ether_device(info->dev)) info->xmit_type = FLOW_OFFLOAD_XMIT_DIRECT; return 0; @@ -255,17 +252,16 @@ static int nft_dev_forward_path(const struct nft_pktinfo *pkt, unsigned char ha[ETH_ALEN]; int i; - if (nft_dev_fill_forward_path(route, dst, ct, dir, ha, &stack) < 0 || + if (nft_dev_fill_forward_path(dst, ct, dir, ha, &stack) < 0 || nft_dev_path_info(&stack, &info, ha, &ft->data) < 0) return -ENOENT; - if (!nft_flowtable_find_dev(info.indev, ft)) + if (!nft_flowtable_find_dev(info.dev, ft)) return -ENOENT; - if (info.outdev) - route->tuple[dir].out.ifindex = info.outdev->ifindex; + route->tuple[!dir].in.ifindex = info.dev->ifindex; + route->tuple[dir].out.ifindex = info.dev->ifindex; - route->tuple[!dir].in.ifindex = info.indev->ifindex; for (i = 0; i < info.num_encaps; i++) { route->tuple[!dir].in.encap[i].id = info.encap[i].id; route->tuple[!dir].in.encap[i].proto = info.encap[i].proto; -- 2.47.3