Merge branch 'master' of github.com:davem330/net
[linux-2.6.git] / net / core / netpoll.c
index 5262251..f57d946 100644 (file)
@@ -762,7 +762,7 @@ int __netpoll_setup(struct netpoll *np)
        }
 
        /* last thing to do is link it to the net device structure */
-       rcu_assign_pointer(ndev->npinfo, npinfo);
+       RCU_INIT_POINTER(ndev->npinfo, npinfo);
 
        return 0;
 
@@ -903,7 +903,7 @@ void __netpoll_cleanup(struct netpoll *np)
                if (ops->ndo_netpoll_cleanup)
                        ops->ndo_netpoll_cleanup(np->dev);
 
-               rcu_assign_pointer(np->dev->npinfo, NULL);
+               RCU_INIT_POINTER(np->dev->npinfo, NULL);
 
                /* avoid racing with NAPI reading npinfo */
                synchronize_rcu_bh();