| Message ID | 20230807020947.1991716-1-william.xuanziyang@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 794529c448008d8bc24d6e06c7528b7dbec99dfd |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] ipv6: exthdrs: Replace opencoded swap() implementation | expand |
On Mon, Aug 7, 2023 at 7:40 AM Ziyang Xuan <william.xuanziyang@huawei.com> wrote: > > Get a coccinelle warning as follows: > net/ipv6/exthdrs.c:800:29-30: WARNING opportunity for swap() > > Use swap() to replace opencoded implementation. > > Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> > --- > net/ipv6/exthdrs.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > Looks good to me. Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
From: Ziyang Xuan <william.xuanziyang@huawei.com> Date: Mon, 7 Aug 2023 10:09:47 +0800 > Get a coccinelle warning as follows: > net/ipv6/exthdrs.c:800:29-30: WARNING opportunity for swap() > > Use swap() to replace opencoded implementation. > > Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com> > --- > net/ipv6/exthdrs.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c > index f4bfccae003c..4952ae792450 100644 > --- a/net/ipv6/exthdrs.c > +++ b/net/ipv6/exthdrs.c > @@ -648,7 +648,6 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) > struct inet6_dev *idev = __in6_dev_get(skb->dev); > struct inet6_skb_parm *opt = IP6CB(skb); > struct in6_addr *addr = NULL; > - struct in6_addr daddr; > int n, i; > struct ipv6_rt_hdr *hdr; > struct rt0_hdr *rthdr; > @@ -796,9 +795,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) > return -1; > } > > - daddr = *addr; > - *addr = ipv6_hdr(skb)->daddr; > - ipv6_hdr(skb)->daddr = daddr; > + swap(*addr, ipv6_hdr(skb)->daddr); > > ip6_route_input(skb); > if (skb_dst(skb)->error) { > -- > 2.25.1
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 7 Aug 2023 10:09:47 +0800 you wrote: > Get a coccinelle warning as follows: > net/ipv6/exthdrs.c:800:29-30: WARNING opportunity for swap() > > Use swap() to replace opencoded implementation. > > Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> > > [...] Here is the summary with links: - [net-next] ipv6: exthdrs: Replace opencoded swap() implementation https://git.kernel.org/netdev/net-next/c/794529c44800 You are awesome, thank you!
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index f4bfccae003c..4952ae792450 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -648,7 +648,6 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) struct inet6_dev *idev = __in6_dev_get(skb->dev); struct inet6_skb_parm *opt = IP6CB(skb); struct in6_addr *addr = NULL; - struct in6_addr daddr; int n, i; struct ipv6_rt_hdr *hdr; struct rt0_hdr *rthdr; @@ -796,9 +795,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) return -1; } - daddr = *addr; - *addr = ipv6_hdr(skb)->daddr; - ipv6_hdr(skb)->daddr = daddr; + swap(*addr, ipv6_hdr(skb)->daddr); ip6_route_input(skb); if (skb_dst(skb)->error) {
Get a coccinelle warning as follows: net/ipv6/exthdrs.c:800:29-30: WARNING opportunity for swap() Use swap() to replace opencoded implementation. Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> --- net/ipv6/exthdrs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)