ipv6: ah6: use swap() to make code cleaner

Yao Jing · davem330 · commit 4cdf85ef2371 · 2021-11-18T12:00:15.000Z
Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid
opencoding it.

Reported-by: Zeal Robot &lt;zealci@zte.com.cn&gt;
Signed-off-by: Yao Jing &lt;yao.jing2@zte.com.cn&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
@@ -175,7 +175,6 @@ static void ipv6_rearrange_destopt(struct ipv6hdr *iph, struct ipv6_opt_hdr *des
 			 * See 11.3.2 of RFC 3775 for details.
 			 */
 			if (opt[off] == IPV6_TLV_HAO) {
-				struct in6_addr final_addr;
 				struct ipv6_destopt_hao *hao;
 
 				hao = (struct ipv6_destopt_hao *)&opt[off];
@@ -184,9 +183,7 @@ static void ipv6_rearrange_destopt(struct ipv6hdr *iph, struct ipv6_opt_hdr *des
 							     hao->length);
 					goto bad;
 				}
-				final_addr = hao->addr;
-				hao->addr = iph->saddr;
-				iph->saddr = final_addr;
+				swap(hao->addr, iph->saddr);
 			}
 			break;
 		}

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,6 @@ static void ipv6_rearrange_destopt(struct ipv6hdr iph, struct ipv6_opt_hdr des`
`175`	`175`	`* See 11.3.2 of RFC 3775 for details.`
`176`	`176`	`*/`
`177`	`177`	`if (opt[off] == IPV6_TLV_HAO) {`
`178`		`- struct in6_addr final_addr;`
`179`	`178`	`struct ipv6_destopt_hao *hao;`
`180`	`179`
`181`	`180`	`hao = (struct ipv6_destopt_hao *)&opt[off];`
`@@ -184,9 +183,7 @@ static void ipv6_rearrange_destopt(struct ipv6hdr iph, struct ipv6_opt_hdr des`
`184`	`183`	`hao->length);`
`185`	`184`	`goto bad;`
`186`	`185`	`}`
`187`		`- final_addr = hao->addr;`
`188`		`- hao->addr = iph->saddr;`
`189`		`- iph->saddr = final_addr;`
	`186`	`+ swap(hao->addr, iph->saddr);`
`190`	`187`	`}`
`191`	`188`	`break;`
`192`	`189`	`}`