From: Pavel Emelyanov Date: Sat, 8 Dec 2007 07:55:43 +0000 (-0800) Subject: [IPV4]: Swap the ifa allocation with the"ipv4_devconf_setall" call X-Git-Tag: v2.6.24-rc6~113 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a4e65d36a959005f14142535b58c44cd0f1de8cb;p=linux-2.6-omap-h63xx.git [IPV4]: Swap the ifa allocation with the"ipv4_devconf_setall" call According to Herbert, the ipv4_devconf_setall should be called only when the ifa is added to the device. However, failed ifa allocation may bring things into inconsistent state. Move the call to ipv4_devconf_setall after the ifa allocation. Fits both net-2.6 (with offsets) and net-2.6.25 (cleanly). Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller --- diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 55d199e4ae2..3168c3de491 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -516,8 +516,6 @@ static struct in_ifaddr *rtm_to_ifaddr(struct nlmsghdr *nlh) goto errout; } - ipv4_devconf_setall(in_dev); - ifa = inet_alloc_ifa(); if (ifa == NULL) { /* @@ -528,6 +526,7 @@ static struct in_ifaddr *rtm_to_ifaddr(struct nlmsghdr *nlh) goto errout; } + ipv4_devconf_setall(in_dev); in_dev_hold(in_dev); if (tb[IFA_ADDRESS] == NULL)