aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSascha Hlusiak <contact@saschahlusiak.de>2009-05-19 12:56:52 +0000
committerDavid S. Miller <davem@davemloft.net>2009-05-19 16:02:02 -0700
commit645069299a1c7358cf7330afe293f07552f11a5d (patch)
tree889c39a10ef09cd77c5b052ef837bb4b53bddd83 /include
parent9af28511be10e175eb0cabb2ba5cfafe77408d84 (diff)
downloadmrst-s0i3-test-645069299a1c7358cf7330afe293f07552f11a5d.tar.gz
mrst-s0i3-test-645069299a1c7358cf7330afe293f07552f11a5d.tar.xz
mrst-s0i3-test-645069299a1c7358cf7330afe293f07552f11a5d.zip
sit: stateless autoconf for isatap
be sent periodically. The rs_delay can be speficied when adding the PRL entry and defaults to 15 minutes. The RS is sent from every link local adress that's assigned to the tunnel interface. It's directed to the (guessed) linklocal address of the router and is sent through the tunnel. Better: send to ff02::2 encapsuled in unicast directed to router-v4. Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/if_tunnel.h2
-rw-r--r--include/net/ipip.h7
2 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 5a9aae4adb4..5eb9b0f857e 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 __reserved2;
+ __u32 rs_delay;
/* data follows */
};
diff --git a/include/net/ipip.h b/include/net/ipip.h
index fdf9bd74370..5d3036fa151 100644
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -28,11 +28,18 @@ 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 { \