diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-11-02 23:56:40 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-11-02 23:56:40 -0400 |
| commit | 31cbecb4ab538f433145bc5a46f3bea9b9627031 (patch) | |
| tree | d6206d42dea7298f7ef05fd1f7bf474245f0d43a /net/core/netpoll.c | |
| parent | 2b72c9ccd22c4a3299e5a358dcd639fb253730f4 (diff) | |
| parent | 278c023a99b0d6b471d0f4a79835c703482e29ac (diff) | |
Merge branch 'osd-devel' into nfs-for-next
Diffstat (limited to 'net/core/netpoll.c')
| -rw-r--r-- | net/core/netpoll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 52622517e0d8..f57d94627a2a 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
| @@ -762,7 +762,7 @@ int __netpoll_setup(struct netpoll *np) | |||
| 762 | } | 762 | } |
| 763 | 763 | ||
| 764 | /* last thing to do is link it to the net device structure */ | 764 | /* last thing to do is link it to the net device structure */ |
| 765 | rcu_assign_pointer(ndev->npinfo, npinfo); | 765 | RCU_INIT_POINTER(ndev->npinfo, npinfo); |
| 766 | 766 | ||
| 767 | return 0; | 767 | return 0; |
| 768 | 768 | ||
| @@ -903,7 +903,7 @@ void __netpoll_cleanup(struct netpoll *np) | |||
| 903 | if (ops->ndo_netpoll_cleanup) | 903 | if (ops->ndo_netpoll_cleanup) |
| 904 | ops->ndo_netpoll_cleanup(np->dev); | 904 | ops->ndo_netpoll_cleanup(np->dev); |
| 905 | 905 | ||
| 906 | rcu_assign_pointer(np->dev->npinfo, NULL); | 906 | RCU_INIT_POINTER(np->dev->npinfo, NULL); |
| 907 | 907 | ||
| 908 | /* avoid racing with NAPI reading npinfo */ | 908 | /* avoid racing with NAPI reading npinfo */ |
| 909 | synchronize_rcu_bh(); | 909 | synchronize_rcu_bh(); |