net: ipv4: reset check_lifetime_work after changing lifetime

jpirko · davem330 · commit 05a324b9c50c · 2013-04-08T12:04:51.000-04:00
This will result in calling check_lifetime in nearest opportunity and that function will adjust next time to call check_lifetime correctly. Without this, check_lifetime is called in time computed by previous run, not affecting modified lifetime. Introduced by: commit 5c766d6 "ipv4: introduce address lifetime" Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
@@ -804,6 +804,8 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg
 			return -EEXIST;
 		ifa = ifa_existing;
 		set_ifa_lifetime(ifa, valid_lft, prefered_lft);
+		cancel_delayed_work(&check_lifetime_work);
+		schedule_delayed_work(&check_lifetime_work, 0);
 		rtmsg_ifa(RTM_NEWADDR, ifa, nlh, NETLINK_CB(skb).portid);
 		blocking_notifier_call_chain(&inetaddr_chain, NETDEV_UP, ifa);
 	}

Original file line number	Diff line number	Diff line change
`@@ -804,6 +804,8 @@ static int inet_rtm_newaddr(struct sk_buff skb, struct nlmsghdr nlh, void *arg`
`804`	`804`	`return -EEXIST;`
`805`	`805`	`ifa = ifa_existing;`
`806`	`806`	`set_ifa_lifetime(ifa, valid_lft, prefered_lft);`
	`807`	`+ cancel_delayed_work(&check_lifetime_work);`
	`808`	`+ schedule_delayed_work(&check_lifetime_work, 0);`
`807`	`809`	`rtmsg_ifa(RTM_NEWADDR, ifa, nlh, NETLINK_CB(skb).portid);`
`808`	`810`	`blocking_notifier_call_chain(&inetaddr_chain, NETDEV_UP, ifa);`
`809`	`811`	`}`