]>
Commit | Line | Data |
---|---|---|
a3af7eaa GKH |
1 | From 13e570f1d520d1383b4d8837fb5adb1f24a31661 Mon Sep 17 00:00:00 2001 |
2 | From: Gao feng <gaofeng@cn.fujitsu.com> | |
3 | Date: Thu, 4 Oct 2012 20:15:49 +0000 | |
4 | Subject: infiniband: pass rdma_cm module to netlink_dump_start | |
5 | ||
6 | ||
7 | From: Gao feng <gaofeng@cn.fujitsu.com> | |
8 | ||
9 | [ Upstream commit 809d5fc9bf6589276a12bd4fd611e4c7ff9940c3 ] | |
10 | ||
11 | set netlink_dump_control.module to avoid panic. | |
12 | ||
13 | Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> | |
14 | Cc: Roland Dreier <roland@kernel.org> | |
15 | Cc: Sean Hefty <sean.hefty@intel.com> | |
16 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
18 | --- | |
19 | drivers/infiniband/core/cma.c | 3 ++- | |
20 | drivers/infiniband/core/netlink.c | 1 + | |
21 | include/rdma/rdma_netlink.h | 1 + | |
22 | 3 files changed, 4 insertions(+), 1 deletion(-) | |
23 | ||
24 | --- a/drivers/infiniband/core/cma.c | |
25 | +++ b/drivers/infiniband/core/cma.c | |
26 | @@ -3495,7 +3495,8 @@ out: | |
27 | } | |
28 | ||
29 | static const struct ibnl_client_cbs cma_cb_table[] = { | |
30 | - [RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats }, | |
31 | + [RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats, | |
32 | + .module = THIS_MODULE }, | |
33 | }; | |
34 | ||
35 | static int __init cma_init(void) | |
36 | --- a/drivers/infiniband/core/netlink.c | |
37 | +++ b/drivers/infiniband/core/netlink.c | |
38 | @@ -154,6 +154,7 @@ static int ibnl_rcv_msg(struct sk_buff * | |
39 | { | |
40 | struct netlink_dump_control c = { | |
41 | .dump = client->cb_table[op].dump, | |
42 | + .module = client->cb_table[op].module, | |
43 | }; | |
44 | return netlink_dump_start(nls, skb, nlh, &c); | |
45 | } | |
46 | --- a/include/rdma/rdma_netlink.h | |
47 | +++ b/include/rdma/rdma_netlink.h | |
48 | @@ -39,6 +39,7 @@ struct rdma_cm_id_stats { | |
49 | ||
50 | struct ibnl_client_cbs { | |
51 | int (*dump)(struct sk_buff *skb, struct netlink_callback *nlcb); | |
52 | + struct module *module; | |
53 | }; | |
54 | ||
55 | int ibnl_init(void); |