sit: always notify change when params are updated (f9cd5a55) · Commits · 戴 / test

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 sit tunnels management via rtnl. The code which update tunnels will be put in a new function. Signed-off-by:

Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv6/sit.c

+15 −17

Original line number	Diff line number	Diff line
		@@ -978,6 +978,8 @@ ipip6_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)
		break;
		}
		t = netdev_priv(dev);
		}

		ipip6_tunnel_unlink(sitn, t);
		synchronize_net();
		t->parms.iph.saddr = p.iph.saddr;
		@@ -985,21 +987,17 @@ ipip6_tunnel_ioctl (struct net_device dev, struct ifreq ifr, int cmd)
		memcpy(dev->dev_addr, &p.iph.saddr, 4);
		memcpy(dev->broadcast, &p.iph.daddr, 4);
		ipip6_tunnel_link(sitn, t);
		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;
		if (t->parms.link != p.link) {
		t->parms.link = p.link;
		ipip6_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)))
		err = -EFAULT;
		} else

Admin message