summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorSascha Hlusiak <contact@saschahlusiak.de>2009-09-26 20:28:07 -0700
committerDavid S. Miller <davem@davemloft.net>2009-09-26 20:28:07 -0700
commitd1f8297a96b0d70f17704296a6666468f2087ce6 (patch)
tree308ecb282fcaf98439918c13178a2dc326bc8eb0 /include/linux
parent7eaf5077b37bb33dbd44e569ff88566d6fe286e9 (diff)
downloadlinux-rpi-d1f8297a96b0d70f17704296a6666468f2087ce6.tar.gz
linux-rpi-d1f8297a96b0d70f17704296a6666468f2087ce6.tar.bz2
linux-rpi-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/linux')
-rw-r--r--include/linux/if_tunnel.h2
1 files changed, 1 insertions, 1 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 */
};