Commit:     a4e65d36a959005f14142535b58c44cd0f1de8cb
Parent:     1df2e44560c0d72f381126e52a3ba53614c1c484
Author:     Pavel Emelyanov <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 7 23:55:43 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Tue Dec 11 02:45:25 2007 -0800

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 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 55d199e..3168c3d 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);
        if (tb[IFA_ADDRESS] == NULL)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to