[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1386146917-2951-1-git-send-email-liuhangbin@gmail.com>
Date: Wed, 4 Dec 2013 16:48:37 +0800
From: Hangbin Liu <liuhangbin@...il.com>
To: network dev <netdev@...r.kernel.org>
Cc: Cong Wang <xiyou.wangcong@...il.com>,
Saurabh Mohan <saurabh.mohan@...tta.com>,
Hangbin Liu <liuhangbin@...il.com>
Subject: [PATCH] vti: remove GRE_KEY flag for vti tunnel
vti tunnel use IPPROTO_IPIP instead of IPPROTO_GRE, and keys are not allowed
with ipip tunnel. So there is no reason to set GRE_KEY flag for vti.
Signed-off-by: Hangbin Liu <liuhangbin@...il.com>
---
net/ipv4/ip_vti.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 52b802a..58c4e6a 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -185,10 +185,8 @@ vti_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if (err)
return err;
- if (cmd != SIOCDELTUNNEL) {
- p.i_flags |= GRE_KEY | VTI_ISVTI;
- p.o_flags |= GRE_KEY;
- }
+ if (cmd != SIOCDELTUNNEL)
+ p.i_flags |= VTI_ISVTI;
if (copy_to_user(ifr->ifr_ifru.ifru_data, &p, sizeof(p)))
return -EFAULT;
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists