[PATCH RFC 6/7] net: TX path for IPIP/UDP Generic UDP Encpasulation
From: Tom Herbert <hidden>
Date: 2014-01-02 22:19:04
Subsystem:
networking [general], networking [ipv4/ipv6], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, David Ahern, Ido Schimmel, Linus Torvalds
Support for transmitting encapsulation IPIP in UDP. Signed-off-by: Tom Herbert <redacted> --- net/ipv4/ipip.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index fe3e9f7..2e997d3 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c@@ -240,6 +240,11 @@ ipip_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) int err = 0; struct ip_tunnel_parm p; + /* Try generic tunnel ioctls first */ + err = ip_tunnel_gen_ioctl(dev, ifr, cmd); + if (err != -ENOIOCTLCMD) + return err; + if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p))) return -EFAULT;
@@ -301,7 +306,8 @@ static int ipip_tunnel_init(struct net_device *dev) memcpy(dev->dev_addr, &tunnel->parms.iph.saddr, 4); memcpy(dev->broadcast, &tunnel->parms.iph.daddr, 4); - tunnel->hlen = 0; + tunnel->tun_hlen = 0; + tunnel->hlen = tunnel->tun_hlen + tunnel->encap_hlen; tunnel->parms.iph.protocol = IPPROTO_IPIP; return ip_tunnel_init(dev); }
--
1.8.5.1