X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=net%2Fipv6%2Fip6_vti.c;h=644ba59fbd9d5ed8d6ba4a8082dd327589c9bb68;hb=590dce2d4934fb909b112cd80c80486362337744;hp=c795fee372c4992cf6c391330a85d7d017a7a3a5;hpb=ccaba0621a8577ce6b84cf625f2b9a4c6466d999;p=linux-2.6-microblaze.git

diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index c795fee372c4..644ba59fbd9d 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -693,6 +693,10 @@ vti6_parm_to_user(struct ip6_tnl_parm2 *u, const struct __ip6_tnl_parm *p)
 	u->link = p->link;
 	u->i_key = p->i_key;
 	u->o_key = p->o_key;
+	if (u->i_key)
+		u->i_flags |= GRE_KEY;
+	if (u->o_key)
+		u->o_flags |= GRE_KEY;
 	u->proto = p->proto;
 
 	memcpy(u->name, p->name, sizeof(u->name));