git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
connector: Delete buggy notification code.
[safe/jmp/linux-2.6]
/
include
/
linux
/
if_tunnel.h
diff --git
a/include/linux/if_tunnel.h
b/include/linux/if_tunnel.h
index
5eb9b0f
..
1822d63
100644
(file)
--- a/
include/linux/if_tunnel.h
+++ b/
include/linux/if_tunnel.h
@@
-5,6
+5,7
@@
#ifdef __KERNEL__
#include <linux/ip.h>
#ifdef __KERNEL__
#include <linux/ip.h>
+#include <linux/in6.h>
#endif
#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0)
#endif
#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0)
@@
-15,6
+16,10
@@
#define SIOCADDPRL (SIOCDEVPRIVATE + 5)
#define SIOCDELPRL (SIOCDEVPRIVATE + 6)
#define SIOCCHGPRL (SIOCDEVPRIVATE + 7)
#define SIOCADDPRL (SIOCDEVPRIVATE + 5)
#define SIOCDELPRL (SIOCDEVPRIVATE + 6)
#define SIOCCHGPRL (SIOCDEVPRIVATE + 7)
+#define SIOCGET6RD (SIOCDEVPRIVATE + 8)
+#define SIOCADD6RD (SIOCDEVPRIVATE + 9)
+#define SIOCDEL6RD (SIOCDEVPRIVATE + 10)
+#define SIOCCHG6RD (SIOCDEVPRIVATE + 11)
#define GRE_CSUM __cpu_to_be16(0x8000)
#define GRE_ROUTING __cpu_to_be16(0x4000)
#define GRE_CSUM __cpu_to_be16(0x8000)
#define GRE_ROUTING __cpu_to_be16(0x4000)
@@
-25,8
+30,7
@@
#define GRE_FLAGS __cpu_to_be16(0x00F8)
#define GRE_VERSION __cpu_to_be16(0x0007)
#define GRE_FLAGS __cpu_to_be16(0x00F8)
#define GRE_VERSION __cpu_to_be16(0x0007)
-struct ip_tunnel_parm
-{
+struct ip_tunnel_parm {
char name[IFNAMSIZ];
int link;
__be16 i_flags;
char name[IFNAMSIZ];
int link;
__be16 i_flags;
@@
-44,15
+48,21
@@
struct ip_tunnel_prl {
__u16 flags;
__u16 __reserved;
__u32 datalen;
__u16 flags;
__u16 __reserved;
__u32 datalen;
- __u32
rs_delay
;
+ __u32
__reserved2
;
/* data follows */
};
/* PRL flags */
#define PRL_DEFAULT 0x0001
/* data follows */
};
/* PRL flags */
#define PRL_DEFAULT 0x0001
-enum
-{
+struct ip_tunnel_6rd {
+ struct in6_addr prefix;
+ __be32 relay_prefix;
+ __u16 prefixlen;
+ __u16 relay_prefixlen;
+};
+
+enum {
IFLA_GRE_UNSPEC,
IFLA_GRE_LINK,
IFLA_GRE_IFLAGS,
IFLA_GRE_UNSPEC,
IFLA_GRE_LINK,
IFLA_GRE_IFLAGS,