Commit 3b3ccf9e authored Jun 24, 2025 by Yue Haibing Committed by Jakub Kicinski Jun 25, 2025

net: Remove unnecessary NULL check for lwtunnel_fill_encap()



lwtunnel_fill_encap() has NULL check and return 0, so no need
to check before call it.

Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20250624140015.3929241-1-yuehaibing@huawei.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent 2855e43c

net/ipv4/fib_semantics.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1640,8 +1640,7 @@ int fib_nexthop_info(struct sk_buff skb, const struct fib_nh_common nhc,
		nla_put_u32(skb, RTA_OIF, nhc->nhc_dev->ifindex))
		goto nla_put_failure;

		if (nhc->nhc_lwtstate &&
		lwtunnel_fill_encap(skb, nhc->nhc_lwtstate,
		if (lwtunnel_fill_encap(skb, nhc->nhc_lwtstate,
		RTA_ENCAP, RTA_ENCAP_TYPE) < 0)
		goto nla_put_failure;

net/ipv4/nexthop.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -985,8 +985,7 @@ static int nh_fill_node(struct sk_buff skb, struct nexthop nh,
		break;
		}

		if (nhi->fib_nhc.nhc_lwtstate &&
		lwtunnel_fill_encap(skb, nhi->fib_nhc.nhc_lwtstate,
		if (lwtunnel_fill_encap(skb, nhi->fib_nhc.nhc_lwtstate,
		NHA_ENCAP, NHA_ENCAP_TYPE) < 0)
		goto nla_put_failure;

net/ipv4/route.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2978,8 +2978,7 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src,
		if (rt->dst.dev &&
		nla_put_u32(skb, RTA_OIF, rt->dst.dev->ifindex))
		goto nla_put_failure;
		if (rt->dst.lwtstate &&
		lwtunnel_fill_encap(skb, rt->dst.lwtstate, RTA_ENCAP, RTA_ENCAP_TYPE) < 0)
		if (lwtunnel_fill_encap(skb, rt->dst.lwtstate, RTA_ENCAP, RTA_ENCAP_TYPE) < 0)
		goto nla_put_failure;
		#ifdef CONFIG_IP_ROUTE_CLASSID
		if (rt->dst.tclassid &&

net/ipv6/route.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -5852,8 +5852,7 @@ static int rt6_fill_node(struct net net, struct sk_buff skb,
		if (dst->dev && nla_put_u32(skb, RTA_OIF, dst->dev->ifindex))
		goto nla_put_failure;

		if (dst->lwtstate &&
		lwtunnel_fill_encap(skb, dst->lwtstate, RTA_ENCAP, RTA_ENCAP_TYPE) < 0)
		if (lwtunnel_fill_encap(skb, dst->lwtstate, RTA_ENCAP, RTA_ENCAP_TYPE) < 0)
		goto nla_put_failure;
		} else if (rt->fib6_nsiblings) {
		struct fib6_info *sibling;