2020-08-18 09:02:46

by Xu Wang

Subject: [PATCH] rpl_iptunnel: simplify the return expression of rpl_do_srh()

Simplify the return expression.

Signed-off-by: Xu Wang <[email protected]>
---
net/ipv6/rpl_iptunnel.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/net/ipv6/rpl_iptunnel.c b/net/ipv6/rpl_iptunnel.c
index 5fdf3ebb953f..e58ad9ac987c 100644
--- a/net/ipv6/rpl_iptunnel.c
+++ b/net/ipv6/rpl_iptunnel.c
@@ -197,11 +197,7 @@ static int rpl_do_srh(struct sk_buff *skb, const struct rpl_lwt *rlwt)

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.17.1

2020-08-18 19:39:18

by David Miller

Subject: Re: [PATCH] rpl_iptunnel: simplify the return expression of rpl_do_srh()

From: Xu Wang <[email protected]>
Date: Tue, 18 Aug 2020 08:54:54 +0000

> @@ -197,11 +197,7 @@ static int rpl_do_srh(struct sk_buff *skb, const struct rpl_lwt *rlwt)
>
> 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);
> }

Please at least compile test your changes:

net/ipv6/rpl_iptunnel.c: In function ?rpl_do_srh?:
net/ipv6/rpl_iptunnel.c:193:6: warning: unused variable ?err? [-Wunused-variable]
193 | int err = 0;