summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2013-09-12 23:29:17 -0400
committerSteven Rostedt <rostedt@goodmis.org>2013-09-12 23:29:17 -0400
commitd17b4de79998f8a2921baca6314eac69e597b889 (patch)
tree49afa95a9bab68e94cdd3c904e0f226d4f3f11ae
parentffd8a4223919e5262e6c1b95afe452096c960100 (diff)
parent77a83f016ce93273734ae6a732737c0d700e8113 (diff)
downloadlinux-rt-d17b4de79998f8a2921baca6314eac69e597b889.tar.gz
Merge tag 'v3.0.93' into v3.0-rt
This is the 3.0.93 stable release
-rw-r--r--Makefile2
-rw-r--r--net/netlink/genetlink.c7
2 files changed, 1 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index a846aa89d62c..369ce146387d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 3
PATCHLEVEL = 0
-SUBLEVEL = 92
+SUBLEVEL = 93
EXTRAVERSION =
NAME = Sneaky Weasel
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 409dd4056659..874f8ffbe423 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -700,10 +700,6 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb)
struct net *net = sock_net(skb->sk);
int chains_to_skip = cb->args[0];
int fams_to_skip = cb->args[1];
- bool need_locking = chains_to_skip || fams_to_skip;
-
- if (need_locking)
- genl_lock();
for (i = chains_to_skip; i < GENL_FAM_TAB_SIZE; i++) {
n = 0;
@@ -725,9 +721,6 @@ errout:
cb->args[0] = i;
cb->args[1] = n;
- if (need_locking)
- genl_unlock();
-
return skb->len;
}