diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-12-31 18:20:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-31 18:20:10 -0500 |
| commit | c07f30ad68053181b3e8a0e65b0630e12e844f91 (patch) | |
| tree | 8758968aabc844c435ff2a5d7d02c835fccd02a3 /net/ipv4/ipip.c | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next (diff) | |
| parent | Merge tag 'pci-v4.4-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci (diff) | |
| download | wireguard-linux-c07f30ad68053181b3e8a0e65b0630e12e844f91.tar.xz wireguard-linux-c07f30ad68053181b3e8a0e65b0630e12e844f91.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv4/ipip.c')
| -rw-r--r-- | net/ipv4/ipip.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 1f067294cbc5..4044da61e747 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -252,9 +252,6 @@ ipip_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) p.i_key = p.o_key = 0; p.i_flags = p.o_flags = 0; - if (p.iph.ttl) - p.iph.frag_off |= htons(IP_DF); - err = ip_tunnel_ioctl(dev, &p, cmd); if (err) return err; |