xfrm: simplify xfrm_address_t use

In many places, the a6 field is typecasted to struct in6_addr. As the
fields are in union anyway, just add in6_addr type to the union and
get rid of the typecasting.

Modifying the uapi header is okay, the union has still the same size.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 8 insertions, 10 deletions

diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c
index 9949a356d62c..1e205c3253ac 100644
--- a/net/ipv6/xfrm6_mode_beet.c
+++ b/net/ipv6/xfrm6_mode_beet.c
@@ -95,8 +95,8 @@ static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb)
 
         ip6h = ipv6_hdr(skb);
         ip6h->payload_len = htons(skb->len - size);
-        ip6h->daddr = *(struct in6_addr *)&x->sel.daddr.a6;
-        ip6h->saddr = *(struct in6_addr *)&x->sel.saddr.a6;
+        ip6h->daddr = x->sel.daddr.in6;
+        ip6h->saddr = x->sel.saddr.in6;
         err = 0;
 out:
         return err;
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 91d934c22a2a..f337a908a76a 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -61,9 +61,7 @@ static int xfrm6_get_saddr(struct net *net,
                 return -EHOSTUNREACH;
 
         dev = ip6_dst_idev(dst)->dev;
-        ipv6_dev_get_saddr(dev_net(dev), dev,
-                           (struct in6_addr *)&daddr->a6, 0,
-                           (struct in6_addr *)&saddr->a6);
+        ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6, 0, &saddr->in6);
         dst_release(dst);
         return 0;
 }
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 9255fd9d94bc..f0d52d721b3a 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -709,7 +709,7 @@ static unsigned int pfkey_sockaddr_fill(const xfrm_address_t *xaddr, __be16 port
                 sin6->sin6_family = AF_INET6;
                 sin6->sin6_port = port;
                 sin6->sin6_flowinfo = 0;
-                sin6->sin6_addr = *(struct in6_addr *)xaddr->a6;
+                sin6->sin6_addr = xaddr->in6;
                 sin6->sin6_scope_id = 0;
                 return 128;
             }
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index de971b6d38c5..f5e39e35d73a 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1043,12 +1043,12 @@ static struct xfrm_state *__find_acq_core(struct net *net,
                         break;
 
                 case AF_INET6:
-                        *(struct in6_addr *)x->sel.daddr.a6 = *(struct in6_addr *)daddr;
-                        *(struct in6_addr *)x->sel.saddr.a6 = *(struct in6_addr *)saddr;
+                        x->sel.daddr.in6 = daddr->in6;
+                        x->sel.saddr.in6 = saddr->in6;
                         x->sel.prefixlen_d = 128;
                         x->sel.prefixlen_s = 128;
-                        *(struct in6_addr *)x->props.saddr.a6 = *(struct in6_addr *)saddr;
-                        *(struct in6_addr *)x->id.daddr.a6 = *(struct in6_addr *)daddr;
+                        x->props.saddr.in6 = saddr->in6;
+                        x->id.daddr.in6 = daddr->in6;
                         break;
                 }