public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: Remove unnecessary NULL check for lwtunnel_fill_encap()

Browse source 
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>
This commit is contained in:
Yue Haibing 2025-06-24 22:00:15 +08:00 • committed by Jakub Kicinski
parent 2855e43c6b
commit 3b3ccf9ed0
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/ipv4/fib_semantics.c
View file

@ -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)) nla_put_u32(skb, RTA_OIF, nhc->nhc_dev->ifindex))
goto nla_put_failure; goto nla_put_failure;
if (nhc->nhc_lwtstate && if (lwtunnel_fill_encap(skb, nhc->nhc_lwtstate,
lwtunnel_fill_encap(skb, nhc->nhc_lwtstate,
RTA_ENCAP, RTA_ENCAP_TYPE) < 0) RTA_ENCAP, RTA_ENCAP_TYPE) < 0)
goto nla_put_failure; goto nla_put_failure;

3
net/ipv4/nexthop.c
View file

@ -985,8 +985,7 @@ static int nh_fill_node(struct sk_buff *skb, struct nexthop *nh,
break; break;
} }
if (nhi->fib_nhc.nhc_lwtstate && if (lwtunnel_fill_encap(skb, nhi->fib_nhc.nhc_lwtstate,
lwtunnel_fill_encap(skb, nhi->fib_nhc.nhc_lwtstate,
NHA_ENCAP, NHA_ENCAP_TYPE) < 0) NHA_ENCAP, NHA_ENCAP_TYPE) < 0)
goto nla_put_failure; goto nla_put_failure;

3
net/ipv4/route.c
View file

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

3
net/ipv6/route.c
View file

@ -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)) if (dst->dev && nla_put_u32(skb, RTA_OIF, dst->dev->ifindex))
goto nla_put_failure; goto nla_put_failure;
if (dst->lwtstate && if (lwtunnel_fill_encap(skb, dst->lwtstate, RTA_ENCAP, RTA_ENCAP_TYPE) < 0)
lwtunnel_fill_encap(skb, dst->lwtstate, RTA_ENCAP, RTA_ENCAP_TYPE) < 0)
goto nla_put_failure; goto nla_put_failure;
} else if (rt->fib6_nsiblings) { } else if (rt->fib6_nsiblings) {
struct fib6_info *sibling; struct fib6_info *sibling;