diff options
Diffstat (limited to 'include/linux/if_tunnel.h')
-rw-r--r-- | include/linux/if_tunnel.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h index 5a9aae4adb44..16b92d008bed 100644 --- a/include/linux/if_tunnel.h +++ b/include/linux/if_tunnel.h | |||
@@ -2,9 +2,11 @@ | |||
2 | #define _IF_TUNNEL_H_ | 2 | #define _IF_TUNNEL_H_ |
3 | 3 | ||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | #include <asm/byteorder.h> | ||
5 | 6 | ||
6 | #ifdef __KERNEL__ | 7 | #ifdef __KERNEL__ |
7 | #include <linux/ip.h> | 8 | #include <linux/ip.h> |
9 | #include <linux/in6.h> | ||
8 | #endif | 10 | #endif |
9 | 11 | ||
10 | #define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0) | 12 | #define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0) |
@@ -15,6 +17,10 @@ | |||
15 | #define SIOCADDPRL (SIOCDEVPRIVATE + 5) | 17 | #define SIOCADDPRL (SIOCDEVPRIVATE + 5) |
16 | #define SIOCDELPRL (SIOCDEVPRIVATE + 6) | 18 | #define SIOCDELPRL (SIOCDEVPRIVATE + 6) |
17 | #define SIOCCHGPRL (SIOCDEVPRIVATE + 7) | 19 | #define SIOCCHGPRL (SIOCDEVPRIVATE + 7) |
20 | #define SIOCGET6RD (SIOCDEVPRIVATE + 8) | ||
21 | #define SIOCADD6RD (SIOCDEVPRIVATE + 9) | ||
22 | #define SIOCDEL6RD (SIOCDEVPRIVATE + 10) | ||
23 | #define SIOCCHG6RD (SIOCDEVPRIVATE + 11) | ||
18 | 24 | ||
19 | #define GRE_CSUM __cpu_to_be16(0x8000) | 25 | #define GRE_CSUM __cpu_to_be16(0x8000) |
20 | #define GRE_ROUTING __cpu_to_be16(0x4000) | 26 | #define GRE_ROUTING __cpu_to_be16(0x4000) |
@@ -25,8 +31,7 @@ | |||
25 | #define GRE_FLAGS __cpu_to_be16(0x00F8) | 31 | #define GRE_FLAGS __cpu_to_be16(0x00F8) |
26 | #define GRE_VERSION __cpu_to_be16(0x0007) | 32 | #define GRE_VERSION __cpu_to_be16(0x0007) |
27 | 33 | ||
28 | struct ip_tunnel_parm | 34 | struct ip_tunnel_parm { |
29 | { | ||
30 | char name[IFNAMSIZ]; | 35 | char name[IFNAMSIZ]; |
31 | int link; | 36 | int link; |
32 | __be16 i_flags; | 37 | __be16 i_flags; |
@@ -51,8 +56,14 @@ struct ip_tunnel_prl { | |||
51 | /* PRL flags */ | 56 | /* PRL flags */ |
52 | #define PRL_DEFAULT 0x0001 | 57 | #define PRL_DEFAULT 0x0001 |
53 | 58 | ||
54 | enum | 59 | struct ip_tunnel_6rd { |
55 | { | 60 | struct in6_addr prefix; |
61 | __be32 relay_prefix; | ||
62 | __u16 prefixlen; | ||
63 | __u16 relay_prefixlen; | ||
64 | }; | ||
65 | |||
66 | enum { | ||
56 | IFLA_GRE_UNSPEC, | 67 | IFLA_GRE_UNSPEC, |
57 | IFLA_GRE_LINK, | 68 | IFLA_GRE_LINK, |
58 | IFLA_GRE_IFLAGS, | 69 | IFLA_GRE_IFLAGS, |