Commit 3250b4db authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Leon Romanovsky

RDMA/netlink: Rename netlink callback struct

The RDMA netlink client infrastructure was removed and made obsolete.
The old infrastructure defined struct ibnl_client_cbs. Now that all
uses of this have been updated to the new infrastructure, rename the
struct to be compliant with the current stack naming standards:
struct rdma_nl_cbs.
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
parent ff61c425
...@@ -4458,7 +4458,7 @@ static int cma_get_id_stats(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -4458,7 +4458,7 @@ static int cma_get_id_stats(struct sk_buff *skb, struct netlink_callback *cb)
return skb->len; return skb->len;
} }
static const struct ibnl_client_cbs cma_cb_table[] = { static const struct rdma_nl_cbs cma_cb_table[] = {
[RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats}, [RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats},
}; };
......
...@@ -1086,7 +1086,7 @@ struct net_device *ib_get_net_dev_by_params(struct ib_device *dev, ...@@ -1086,7 +1086,7 @@ struct net_device *ib_get_net_dev_by_params(struct ib_device *dev,
} }
EXPORT_SYMBOL(ib_get_net_dev_by_params); EXPORT_SYMBOL(ib_get_net_dev_by_params);
static const struct ibnl_client_cbs ibnl_ls_cb_table[] = { static const struct rdma_nl_cbs ibnl_ls_cb_table[] = {
[RDMA_NL_LS_OP_RESOLVE] = { [RDMA_NL_LS_OP_RESOLVE] = {
.dump = ib_nl_handle_resolve_resp, .dump = ib_nl_handle_resolve_resp,
.flags = RDMA_NL_ADMIN_PERM, .flags = RDMA_NL_ADMIN_PERM,
......
...@@ -80,7 +80,7 @@ const char *__attribute_const__ iwcm_reject_msg(int reason) ...@@ -80,7 +80,7 @@ const char *__attribute_const__ iwcm_reject_msg(int reason)
} }
EXPORT_SYMBOL(iwcm_reject_msg); EXPORT_SYMBOL(iwcm_reject_msg);
static struct ibnl_client_cbs iwcm_nl_cb_table[] = { static struct rdma_nl_cbs iwcm_nl_cb_table[] = {
[RDMA_NL_IWPM_REG_PID] = {.dump = iwpm_register_pid_cb}, [RDMA_NL_IWPM_REG_PID] = {.dump = iwpm_register_pid_cb},
[RDMA_NL_IWPM_ADD_MAPPING] = {.dump = iwpm_add_mapping_cb}, [RDMA_NL_IWPM_ADD_MAPPING] = {.dump = iwpm_add_mapping_cb},
[RDMA_NL_IWPM_QUERY_MAPPING] = {.dump = iwpm_add_and_query_mapping_cb}, [RDMA_NL_IWPM_QUERY_MAPPING] = {.dump = iwpm_add_and_query_mapping_cb},
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
static DEFINE_MUTEX(rdma_nl_mutex); static DEFINE_MUTEX(rdma_nl_mutex);
static struct sock *nls; static struct sock *nls;
static struct { static struct {
const struct ibnl_client_cbs *cb_table; const struct rdma_nl_cbs *cb_table;
} rdma_nl_types[RDMA_NL_NUM_CLIENTS]; } rdma_nl_types[RDMA_NL_NUM_CLIENTS];
int rdma_nl_chk_listeners(unsigned int group) int rdma_nl_chk_listeners(unsigned int group)
...@@ -84,7 +84,7 @@ static bool is_nl_valid(unsigned int type, unsigned int op) ...@@ -84,7 +84,7 @@ static bool is_nl_valid(unsigned int type, unsigned int op)
} }
void rdma_nl_register(unsigned int index, void rdma_nl_register(unsigned int index,
const struct ibnl_client_cbs cb_table[]) const struct rdma_nl_cbs cb_table[])
{ {
mutex_lock(&rdma_nl_mutex); mutex_lock(&rdma_nl_mutex);
if (!is_nl_msg_valid(index, 0)) { if (!is_nl_msg_valid(index, 0)) {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <linux/netlink.h> #include <linux/netlink.h>
#include <uapi/rdma/rdma_netlink.h> #include <uapi/rdma/rdma_netlink.h>
struct ibnl_client_cbs { struct rdma_nl_cbs {
int (*dump)(struct sk_buff *skb, struct netlink_callback *nlcb); int (*dump)(struct sk_buff *skb, struct netlink_callback *nlcb);
u8 flags; u8 flags;
}; };
...@@ -21,7 +21,7 @@ enum rdma_nl_flags { ...@@ -21,7 +21,7 @@ enum rdma_nl_flags {
* @cb_table: A table for op->callback * @cb_table: A table for op->callback
*/ */
void rdma_nl_register(unsigned int index, void rdma_nl_register(unsigned int index,
const struct ibnl_client_cbs cb_table[]); const struct rdma_nl_cbs cb_table[]);
/** /**
* Remove a client from IB netlink. * Remove a client from IB netlink.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment