Commit c38cc4b5 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller

ipip: always notify change when params are updated

netdev_state_change() was called only when end points or link was updated. Now
that all parameters are advertised via netlink, we must advertise any change.

This patch also prepares the support of ipip tunnels management via rtnl. The
code which update tunnels will be put in a new function.
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b112457
...@@ -680,6 +680,8 @@ ipip_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -680,6 +680,8 @@ ipip_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
break; break;
} }
t = netdev_priv(dev); t = netdev_priv(dev);
}
ipip_tunnel_unlink(ipn, t); ipip_tunnel_unlink(ipn, t);
synchronize_net(); synchronize_net();
t->parms.iph.saddr = p.iph.saddr; t->parms.iph.saddr = p.iph.saddr;
...@@ -687,22 +689,18 @@ ipip_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -687,22 +689,18 @@ ipip_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
memcpy(dev->dev_addr, &p.iph.saddr, 4); memcpy(dev->dev_addr, &p.iph.saddr, 4);
memcpy(dev->broadcast, &p.iph.daddr, 4); memcpy(dev->broadcast, &p.iph.daddr, 4);
ipip_tunnel_link(ipn, t); ipip_tunnel_link(ipn, t);
netdev_state_change(dev);
}
}
if (t) {
err = 0;
if (cmd == SIOCCHGTUNNEL) {
t->parms.iph.ttl = p.iph.ttl; t->parms.iph.ttl = p.iph.ttl;
t->parms.iph.tos = p.iph.tos; t->parms.iph.tos = p.iph.tos;
t->parms.iph.frag_off = p.iph.frag_off; t->parms.iph.frag_off = p.iph.frag_off;
if (t->parms.link != p.link) { if (t->parms.link != p.link) {
t->parms.link = p.link; t->parms.link = p.link;
ipip_tunnel_bind_dev(dev); ipip_tunnel_bind_dev(dev);
netdev_state_change(dev);
} }
netdev_state_change(dev);
} }
if (t) {
err = 0;
if (copy_to_user(ifr->ifr_ifru.ifru_data, &t->parms, sizeof(p))) if (copy_to_user(ifr->ifr_ifru.ifru_data, &t->parms, sizeof(p)))
err = -EFAULT; err = -EFAULT;
} else } else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment