aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/if_tunnel.h4
-rw-r--r--include/net/ipip.h5
2 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index f20c224d544c..f1fbe9c930d7 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -7,6 +7,7 @@
7#define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1) 7#define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1)
8#define SIOCDELTUNNEL (SIOCDEVPRIVATE + 2) 8#define SIOCDELTUNNEL (SIOCDEVPRIVATE + 2)
9#define SIOCCHGTUNNEL (SIOCDEVPRIVATE + 3) 9#define SIOCCHGTUNNEL (SIOCDEVPRIVATE + 3)
10#define SIOCGETPRL (SIOCDEVPRIVATE + 4)
10#define SIOCADDPRL (SIOCDEVPRIVATE + 5) 11#define SIOCADDPRL (SIOCDEVPRIVATE + 5)
11#define SIOCDELPRL (SIOCDEVPRIVATE + 6) 12#define SIOCDELPRL (SIOCDEVPRIVATE + 6)
12#define SIOCCHGPRL (SIOCDEVPRIVATE + 7) 13#define SIOCCHGPRL (SIOCDEVPRIVATE + 7)
@@ -38,6 +39,9 @@ struct ip_tunnel_prl {
38 __be32 addr; 39 __be32 addr;
39 __u16 flags; 40 __u16 flags;
40 __u16 __reserved; 41 __u16 __reserved;
42 __u32 datalen;
43 __u32 __reserved2;
44 void __user *data;
41}; 45};
42 46
43/* PRL flags */ 47/* PRL flags */
diff --git a/include/net/ipip.h b/include/net/ipip.h
index 205536a014e8..633ed4def8e3 100644
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -24,13 +24,16 @@ struct ip_tunnel
24 int mlink; 24 int mlink;
25 25
26 struct ip_tunnel_parm parms; 26 struct ip_tunnel_parm parms;
27
27 struct ip_tunnel_prl_entry *prl; /* potential router list */ 28 struct ip_tunnel_prl_entry *prl; /* potential router list */
29 unsigned int prl_count; /* # of entries in PRL */
28}; 30};
29 31
30struct ip_tunnel_prl_entry 32struct ip_tunnel_prl_entry
31{ 33{
32 struct ip_tunnel_prl_entry *next; 34 struct ip_tunnel_prl_entry *next;
33 struct ip_tunnel_prl entry; 35 __be32 addr;
36 u16 flags;
34}; 37};
35 38
36#define IPTUNNEL_XMIT() do { \ 39#define IPTUNNEL_XMIT() do { \