diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-04-07 18:37:01 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-07 18:37:01 -0400 |
| commit | d978a6361ad13f1f9694fcb7b5852d253a544d92 (patch) | |
| tree | 8e8a8c62286fab2c044c4b53563222c1b66d7cb0 /net/ipv4/devinet.c | |
| parent | decnet: remove duplicated include from dn_table.c (diff) | |
| parent | bnx2x: Fix KR2 rapid link flap (diff) | |
| download | linux-dev-d978a6361ad13f1f9694fcb7b5852d253a544d92.tar.xz linux-dev-d978a6361ad13f1f9694fcb7b5852d253a544d92.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/nfc/microread/mei.c
net/netfilter/nfnetlink_queue_core.c
Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/devinet.c')
| -rw-r--r-- | net/ipv4/devinet.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 5d985e367535..2759dfd576ae 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -802,8 +802,10 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh) if (nlh->nlmsg_flags & NLM_F_EXCL || !(nlh->nlmsg_flags & NLM_F_REPLACE)) return -EEXIST; - - set_ifa_lifetime(ifa_existing, valid_lft, prefered_lft); + ifa = ifa_existing; + set_ifa_lifetime(ifa, valid_lft, prefered_lft); + rtmsg_ifa(RTM_NEWADDR, ifa, nlh, NETLINK_CB(skb).portid); + blocking_notifier_call_chain(&inetaddr_chain, NETDEV_UP, ifa); } return 0; } |