From 51749a25c9cbf1508a718af6c94a6da9b2f76830 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Thu, 4 Apr 2013 23:39:38 +0000 Subject: [PATCH] --- yaml --- r: 362390 b: refs/heads/master c: 05a324b9c50c3edbe0ce48ee3e37b210859ef1ae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/devinet.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1f8567d5ab60..4cb0653366ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb28ea3b13b86fb23448525f34720e659bda7aa8 +refs/heads/master: 05a324b9c50c3edbe0ce48ee3e37b210859ef1ae diff --git a/trunk/net/ipv4/devinet.c b/trunk/net/ipv4/devinet.c index 96083b7a436b..00386e02e708 100644 --- a/trunk/net/ipv4/devinet.c +++ b/trunk/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); }