diff --git a/[refs] b/[refs] index 828ae3e8e405..1fd242d90d70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 469de9b90f739f130ab3d483e819888e977596b8 +refs/heads/master: 483479ecc565b7f5845997138eddf5ecbc2684b1 diff --git a/trunk/net/ipv4/devinet.c b/trunk/net/ipv4/devinet.c index 25c8a42965df..480ace9819f6 100644 --- a/trunk/net/ipv4/devinet.c +++ b/trunk/net/ipv4/devinet.c @@ -174,9 +174,10 @@ struct in_device *inetdev_init(struct net_device *dev) ip_mc_init_dev(in_dev); if (dev->flags & IFF_UP) ip_mc_up(in_dev); -out: + /* we can receive as soon as ip_ptr is set -- do this last */ rcu_assign_pointer(dev->ip_ptr, in_dev); +out: return in_dev; out_kfree: kfree(in_dev);