diff options
| author | Jiri Benc <jbenc@redhat.com> | 2015-03-29 10:59:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-31 13:58:35 -0400 |
| commit | 15e318bdc6dfb82914c82fb7ad00badaa8387d8e (patch) | |
| tree | b032216e906107641f907389ce3d5f68a0139ab1 /include/uapi | |
| parent | 8f55db48608b109ad8c7ff4b946ad39b3189a540 (diff) | |
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 'include/uapi')
| -rw-r--r-- | include/uapi/linux/xfrm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h index 02d5125a5ee8..2cd9e608d0d1 100644 --- a/include/uapi/linux/xfrm.h +++ b/include/uapi/linux/xfrm.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef _LINUX_XFRM_H | 1 | #ifndef _LINUX_XFRM_H |
| 2 | #define _LINUX_XFRM_H | 2 | #define _LINUX_XFRM_H |
| 3 | 3 | ||
| 4 | #include <linux/in6.h> | ||
| 4 | #include <linux/types.h> | 5 | #include <linux/types.h> |
| 5 | 6 | ||
| 6 | /* All of the structures in this file may not change size as they are | 7 | /* All of the structures in this file may not change size as they are |
| @@ -13,6 +14,7 @@ | |||
| 13 | typedef union { | 14 | typedef union { |
| 14 | __be32 a4; | 15 | __be32 a4; |
| 15 | __be32 a6[4]; | 16 | __be32 a6[4]; |
| 17 | struct in6_addr in6; | ||
| 16 | } xfrm_address_t; | 18 | } xfrm_address_t; |
| 17 | 19 | ||
| 18 | /* Ident of a specific xfrm_state. It is used on input to lookup | 20 | /* Ident of a specific xfrm_state. It is used on input to lookup |
