summaryrefslogtreecommitdiffstats
path: root/ip/iptunnel.c
diff options
context:
space:
mode:
authorSascha Hlusiak <Sascha@hlusiak.de>2009-03-27 11:14:00 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-03-27 11:14:00 -0700
commiteeef12c514269092ce679bf618a219fd8ad2aa68 (patch)
tree074ab36d007430767e9881b6ee63f10fd124469f /ip/iptunnel.c
parent6cdbf3706350c4d724ea8d35267ae93a4d99eab0 (diff)
iptunnel: allow ISATAP with stateless autoconf
please commit my patch below to the iproutes package. It just an incorrect check so that adding an isatap tunnel with remote works, since it's needed if one wants to use stateless autoconf. The current check makes tunnel mode isatap unusable for all client users.
Diffstat (limited to 'ip/iptunnel.c')
-rw-r--r--ip/iptunnel.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/ip/iptunnel.c b/ip/iptunnel.c
index 0d9a17f0..7bee1623 100644
--- a/ip/iptunnel.c
+++ b/ip/iptunnel.c
@@ -252,13 +252,8 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
fprintf(stderr, "Broadcast tunnel requires a source address.\n");
return -1;
}
- if (isatap) {
- if (p->iph.daddr) {
- fprintf(stderr, "no remote with isatap.\n");
- return -1;
- }
+ if (isatap)
p->i_flags |= SIT_ISATAP;
- }
return 0;
}