1 files changed, 16 insertions, 18 deletions

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 099fc1c428b4..4be88cc98957 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -680,29 +680,27 @@ ipip_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
                                         break;
                                 }
                                 t = netdev_priv(dev);
-                                ipip_tunnel_unlink(ipn, t);
-                                synchronize_net();
-                                t->parms.iph.saddr = p.iph.saddr;
-                                t->parms.iph.daddr = p.iph.daddr;
-                                memcpy(dev->dev_addr, &p.iph.saddr, 4);
-                                memcpy(dev->broadcast, &p.iph.daddr, 4);
-                                ipip_tunnel_link(ipn, t);
-                                netdev_state_change(dev);
                         }
+
+                        ipip_tunnel_unlink(ipn, t);
+                        synchronize_net();
+                        t->parms.iph.saddr = p.iph.saddr;
+                        t->parms.iph.daddr = p.iph.daddr;
+                        memcpy(dev->dev_addr, &p.iph.saddr, 4);
+                        memcpy(dev->broadcast, &p.iph.daddr, 4);
+                        ipip_tunnel_link(ipn, t);
+                        t->parms.iph.ttl = p.iph.ttl;
+                        t->parms.iph.tos = p.iph.tos;
+                        t->parms.iph.frag_off = p.iph.frag_off;
+                        if (t->parms.link != p.link) {
+                                t->parms.link = p.link;
+                                ipip_tunnel_bind_dev(dev);
+                        }
+                        netdev_state_change(dev);
                 }
 
                 if (t) {
                         err = 0;
-                        if (cmd == SIOCCHGTUNNEL) {
-                                t->parms.iph.ttl = p.iph.ttl;
-                                t->parms.iph.tos = p.iph.tos;
-                                t->parms.iph.frag_off = p.iph.frag_off;
-                                if (t->parms.link != p.link) {
-                                        t->parms.link = p.link;
-                                        ipip_tunnel_bind_dev(dev);
-                                        netdev_state_change(dev);
-                                }
-                        }
                         if (copy_to_user(ifr->ifr_ifru.ifru_data, &t->parms, sizeof(p)))
                                 err = -EFAULT;
                 } else