* [PATCH net-next] net: ipv6: rpl_iptunnel: simplify the return expression of rpl_do_srh()
@ 2020-12-08 12:09 Zheng Yongjun
2020-12-09 0:25 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Zheng Yongjun @ 2020-12-08 12:09 UTC (permalink / raw)
To: davem, kuznet, yoshfuji, kuba, netdev, linux-kernel; +Cc: Zheng Yongjun
Simplify the return expression.
Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
---
net/ipv6/rpl_iptunnel.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/net/ipv6/rpl_iptunnel.c b/net/ipv6/rpl_iptunnel.c
index 5fdf3ebb953f..f16cf45a2421 100644
--- a/net/ipv6/rpl_iptunnel.c
+++ b/net/ipv6/rpl_iptunnel.c
@@ -190,18 +190,13 @@ static int rpl_do_srh(struct sk_buff *skb, const struct rpl_lwt *rlwt)
{
struct dst_entry *dst = skb_dst(skb);
struct rpl_iptunnel_encap *tinfo;
- int err = 0;
if (skb->protocol != htons(ETH_P_IPV6))
return -EINVAL;
tinfo = rpl_encap_lwtunnel(dst->lwtstate);
- err = rpl_do_srh_inline(skb, rlwt, tinfo->srh);
- if (err)
- return err;
-
- return 0;
+ return rpl_do_srh_inline(skb, rlwt, tinfo->srh);
}
static int rpl_output(struct net *net, struct sock *sk, struct sk_buff *skb)
--
2.22.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: ipv6: rpl_iptunnel: simplify the return expression of rpl_do_srh()
2020-12-08 12:09 [PATCH net-next] net: ipv6: rpl_iptunnel: simplify the return expression of rpl_do_srh() Zheng Yongjun
@ 2020-12-09 0:25 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-12-09 0:25 UTC (permalink / raw)
To: zhengyongjun3; +Cc: kuznet, yoshfuji, kuba, netdev, linux-kernel
From: Zheng Yongjun <zhengyongjun3@huawei.com>
Date: Tue, 8 Dec 2020 20:09:49 +0800
> Simplify the return expression.
>
> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-09 0:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-08 12:09 [PATCH net-next] net: ipv6: rpl_iptunnel: simplify the return expression of rpl_do_srh() Zheng Yongjun
2020-12-09 0:25 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).