diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/if_tunnel.h | 2 | ||||
-rw-r--r-- | include/net/ipip.h | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h index 5eb9b0f857e0..5a9aae4adb44 100644 --- a/include/linux/if_tunnel.h +++ b/include/linux/if_tunnel.h | |||
@@ -44,7 +44,7 @@ struct ip_tunnel_prl { | |||
44 | __u16 flags; | 44 | __u16 flags; |
45 | __u16 __reserved; | 45 | __u16 __reserved; |
46 | __u32 datalen; | 46 | __u32 datalen; |
47 | __u32 rs_delay; | 47 | __u32 __reserved2; |
48 | /* data follows */ | 48 | /* data follows */ |
49 | }; | 49 | }; |
50 | 50 | ||
diff --git a/include/net/ipip.h b/include/net/ipip.h index 76e3ea6e2fe5..87acf8f3a155 100644 --- a/include/net/ipip.h +++ b/include/net/ipip.h | |||
@@ -27,18 +27,11 @@ struct ip_tunnel | |||
27 | unsigned int prl_count; /* # of entries in PRL */ | 27 | unsigned int prl_count; /* # of entries in PRL */ |
28 | }; | 28 | }; |
29 | 29 | ||
30 | /* ISATAP: default interval between RS in secondy */ | ||
31 | #define IPTUNNEL_RS_DEFAULT_DELAY (900) | ||
32 | |||
33 | struct ip_tunnel_prl_entry | 30 | struct ip_tunnel_prl_entry |
34 | { | 31 | { |
35 | struct ip_tunnel_prl_entry *next; | 32 | struct ip_tunnel_prl_entry *next; |
36 | __be32 addr; | 33 | __be32 addr; |
37 | u16 flags; | 34 | u16 flags; |
38 | unsigned long rs_delay; | ||
39 | struct timer_list rs_timer; | ||
40 | struct ip_tunnel *tunnel; | ||
41 | spinlock_t lock; | ||
42 | }; | 35 | }; |
43 | 36 | ||
44 | #define IPTUNNEL_XMIT() do { \ | 37 | #define IPTUNNEL_XMIT() do { \ |