diff options
| author | Sascha Hlusiak <contact@saschahlusiak.de> | 2009-09-27 05:28:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-27 05:28:07 +0200 |
| commit | d1f8297a96b0d70f17704296a6666468f2087ce6 (patch) | |
| tree | 308ecb282fcaf98439918c13178a2dc326bc8eb0 /include | |
| parent | net: fix double skb free in dcbnl (diff) | |
| download | linux-d1f8297a96b0d70f17704296a6666468f2087ce6.tar.xz linux-d1f8297a96b0d70f17704296a6666468f2087ce6.zip | |
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')
| -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 { __u16 flags; __u16 __reserved; __u32 datalen; - __u32 rs_delay; + __u32 __reserved2; /* data follows */ }; 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 unsigned int prl_count; /* # of entries in PRL */ }; -/* ISATAP: default interval between RS in secondy */ -#define IPTUNNEL_RS_DEFAULT_DELAY (900) - struct ip_tunnel_prl_entry { struct ip_tunnel_prl_entry *next; __be32 addr; u16 flags; - unsigned long rs_delay; - struct timer_list rs_timer; - struct ip_tunnel *tunnel; - spinlock_t lock; }; #define IPTUNNEL_XMIT() do { \ |