diff options
author | Jiri Benc <jbenc@redhat.com> | 2015-03-29 17:59:24 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-31 20:58:35 +0300 |
commit | 15e318bdc6dfb82914c82fb7ad00badaa8387d8e (patch) | |
tree | b032216e906107641f907389ce3d5f68a0139ab1 /net/key/af_key.c | |
parent | 8f55db48608b109ad8c7ff4b946ad39b3189a540 (diff) | |
download | linux-15e318bdc6dfb82914c82fb7ad00badaa8387d8e.tar.xz |
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>
Diffstat (limited to 'net/key/af_key.c')
-rw-r--r-- | net/key/af_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |