diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-12-08 02:55:43 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-12-11 05:45:25 -0500 |
commit | a4e65d36a959005f14142535b58c44cd0f1de8cb (patch) | |
tree | 8f6e438dfb7e869387538bd4205c01ba05f665f1 /net | |
parent | 1df2e44560c0d72f381126e52a3ba53614c1c484 (diff) |
[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 <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/devinet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 55d199e4ae21..3168c3de4919 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) | |||
516 | goto errout; | 516 | goto errout; |
517 | } | 517 | } |
518 | 518 | ||
519 | ipv4_devconf_setall(in_dev); | ||
520 | |||
521 | ifa = inet_alloc_ifa(); | 519 | ifa = inet_alloc_ifa(); |
522 | if (ifa == NULL) { | 520 | if (ifa == NULL) { |
523 | /* | 521 | /* |
@@ -528,6 +526,7 @@ static struct in_ifaddr *rtm_to_ifaddr(struct nlmsghdr *nlh) | |||
528 | goto errout; | 526 | goto errout; |
529 | } | 527 | } |
530 | 528 | ||
529 | ipv4_devconf_setall(in_dev); | ||
531 | in_dev_hold(in_dev); | 530 | in_dev_hold(in_dev); |
532 | 531 | ||
533 | if (tb[IFA_ADDRESS] == NULL) | 532 | if (tb[IFA_ADDRESS] == NULL) |