diff options
Diffstat (limited to 'include/net/ipip.h')
-rw-r--r-- | include/net/ipip.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/net/ipip.h b/include/net/ipip.h index 5d3036fa151..87acf8f3a15 100644 --- a/include/net/ipip.h +++ b/include/net/ipip.h | |||
@@ -12,7 +12,6 @@ struct ip_tunnel | |||
12 | struct ip_tunnel *next; | 12 | struct ip_tunnel *next; |
13 | struct net_device *dev; | 13 | struct net_device *dev; |
14 | 14 | ||
15 | int recursion; /* Depth of hard_start_xmit recursion */ | ||
16 | int err_count; /* Number of arrived ICMP errors */ | 15 | int err_count; /* Number of arrived ICMP errors */ |
17 | unsigned long err_time; /* Time when the last ICMP error arrived */ | 16 | unsigned long err_time; /* Time when the last ICMP error arrived */ |
18 | 17 | ||
@@ -28,18 +27,11 @@ struct ip_tunnel | |||
28 | unsigned int prl_count; /* # of entries in PRL */ | 27 | unsigned int prl_count; /* # of entries in PRL */ |
29 | }; | 28 | }; |
30 | 29 | ||
31 | /* ISATAP: default interval between RS in secondy */ | ||
32 | #define IPTUNNEL_RS_DEFAULT_DELAY (900) | ||
33 | |||
34 | struct ip_tunnel_prl_entry | 30 | struct ip_tunnel_prl_entry |
35 | { | 31 | { |
36 | struct ip_tunnel_prl_entry *next; | 32 | struct ip_tunnel_prl_entry *next; |
37 | __be32 addr; | 33 | __be32 addr; |
38 | u16 flags; | 34 | u16 flags; |
39 | unsigned long rs_delay; | ||
40 | struct timer_list rs_timer; | ||
41 | struct ip_tunnel *tunnel; | ||
42 | spinlock_t lock; | ||
43 | }; | 35 | }; |
44 | 36 | ||
45 | #define IPTUNNEL_XMIT() do { \ | 37 | #define IPTUNNEL_XMIT() do { \ |