Magellan Linux

Contents of /trunk/kernel26-alx/patches-3.10/0108-3.10.9-all-fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2672 - (show annotations) (download)
Tue Jul 21 16:46:35 2015 UTC (8 years, 9 months ago) by niro
File size: 867 byte(s)
-3.10.84-alx-r1
1 diff --git a/Makefile b/Makefile
2 index 1a216126..4b31d623 100644
3 --- a/Makefile
4 +++ b/Makefile
5 @@ -1,6 +1,6 @@
6 VERSION = 3
7 PATCHLEVEL = 10
8 -SUBLEVEL = 8
9 +SUBLEVEL = 9
10 EXTRAVERSION =
11 NAME = TOSSUG Baby Fish
12
13 diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
14 index ba6e55d1..1076fe16 100644
15 --- a/net/netlink/genetlink.c
16 +++ b/net/netlink/genetlink.c
17 @@ -789,10 +789,6 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb)
18 struct net *net = sock_net(skb->sk);
19 int chains_to_skip = cb->args[0];
20 int fams_to_skip = cb->args[1];
21 - bool need_locking = chains_to_skip || fams_to_skip;
22 -
23 - if (need_locking)
24 - genl_lock();
25
26 for (i = chains_to_skip; i < GENL_FAM_TAB_SIZE; i++) {
27 n = 0;
28 @@ -814,9 +810,6 @@ errout:
29 cb->args[0] = i;
30 cb->args[1] = n;
31
32 - if (need_locking)
33 - genl_unlock();
34 -
35 return skb->len;
36 }
37