summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2010-06-24 20:33:04 -0700
committerDavid S. Miller <davem@davemloft.net>2010-06-24 20:33:04 -0700
commitdeb0d7c740a008a4e26806317497549b0e8907eb (patch)
treeb6ffba9115734077ffe6d971cdb61b759e326790 /net
parent8244132ea89cdd128003f5b9980fab50d8d36d72 (diff)
downloadlinux-3.10-deb0d7c740a008a4e26806317497549b0e8907eb.tar.gz
linux-3.10-deb0d7c740a008a4e26806317497549b0e8907eb.tar.bz2
linux-3.10-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')
-rw-r--r--net/core/netpoll.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 560297ee55b..ca6dc31843e 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;