diff options
| author |   Andrew Morton <akpm@linux-foundation.org> | 2010-06-24 20:33:04 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-06-24 20:33:04 -0700 |
| commit | deb0d7c740a008a4e26806317497549b0e8907eb (patch) | |
| tree | b6ffba9115734077ffe6d971cdb61b759e326790 /net/core | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-dev-deb0d7c740a008a4e26806317497549b0e8907eb.tar.xz linux-dev-deb0d7c740a008a4e26806317497549b0e8907eb.zip | |
net: fix "netpoll: Allow netpoll_setup/cleanup recursion"
Remove rtnl_unlock() which had no corresponding rtnl_lock().
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/netpoll.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 560297ee55b4..ca6dc31843ea 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -748,7 +748,6 @@ int __netpoll_setup(struct netpoll *np) /* last thing to do is link it to the net device structure */ rcu_assign_pointer(ndev->npinfo, npinfo); - rtnl_unlock(); return 0; |