[<prev] [next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.02.1401021415030.32603@tomh.mtv.corp.google.com>
Date: Thu, 2 Jan 2014 14:19:12 -0800 (PST)
From: Tom Herbert <therbert@...gle.com>
To: davem@...emloft.net, netdev@...r.kernel.org
cc: hkchu@...gle.com
Subject: [PATCH RFC 7/7] net: TX path for IPv6/UDP Generic UDP
Encpasulation
Signed-off-by: Tom Herbert <therbert@...gle.com>
---
net/ipv6/sit.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 366fbba..2abe2b8 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1126,6 +1126,13 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
struct ip_tunnel_6rd ip6rd;
#endif
+
+ /* Try generic tunnel ioctls first */
+ err = ip_tunnel_gen_ioctl(dev, ifr, cmd);
+ if (err != -ENOIOCTLCMD)
+ return err;
+
+ err = 0;
switch (cmd) {
case SIOCGETTUNNEL:
#ifdef CONFIG_IPV6_SIT_6RD
--
1.8.5.1
--
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