diff options
author | Sascha Hlusiak <contact@saschahlusiak.de> | 2009-09-26 23:28:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-26 23:28:07 -0400 |
commit | d1f8297a96b0d70f17704296a6666468f2087ce6 (patch) | |
tree | 308ecb282fcaf98439918c13178a2dc326bc8eb0 /include/net/ipip.h | |
parent | 7eaf5077b37bb33dbd44e569ff88566d6fe286e9 (diff) |
Revert "sit: stateless autoconf for isatap"
This reverts commit 645069299a1c7358cf7330afe293f07552f11a5d.
While the code does not actually break anything, it does not completely follow
RFC5214 yet. After talking back with Fred L. Templin, I agree that completing the
ISATAP specific RS/RA code, would pollute the kernel a lot with code that is better
implemented in userspace.
The kernel should not send RS packages for ISATAP at all.
Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de>
Acked-by: Fred L. Templin <Fred.L.Templin@boeing.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ipip.h')
-rw-r--r-- | include/net/ipip.h | 7 |
1 files changed, 0 insertions, 7 deletions
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 { \ |