On Tue, Jun 13, 2017 at 03:59:23AM -0500, Leon Romanovsky wrote: > From: Leon Romanovsky <leonro@xxxxxxxxxxxx> > > RDMA netlink has complicated infrastructure to add and remove netlink > clients to NETLINK_RDMA family. This complicates the code and not in > use because not many clients are available (3 clients) and most of them > (2 clients) are statically compiled together with netlink.c. > > The following patch refactors RDMA netlink and opens door for the future > patches which will be able to get rid of a lot of dead iwcm* code. > > Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx> > Reviewed-by: Chien Tin Tung <chien.tin.tung@xxxxxxxxx> > --- > drivers/infiniband/core/cma.c | 6 +- > drivers/infiniband/core/device.c | 41 +++------ > drivers/infiniband/core/iwcm.c | 10 +-- > drivers/infiniband/core/netlink.c | 185 ++++++++++++++++++-------------------- > include/rdma/rdma_netlink.h | 17 ++-- > 5 files changed, 110 insertions(+), 149 deletions(-) > diff --git a/include/rdma/rdma_netlink.h b/include/rdma/rdma_netlink.h > index 585266144329..6735dcf5d2a3 100644 > --- a/include/rdma/rdma_netlink.h > +++ b/include/rdma/rdma_netlink.h > @@ -10,27 +10,22 @@ struct ibnl_client_cbs { > struct module *module; > }; > > -int ibnl_init(void); > -void ibnl_cleanup(void); > +int rdma_nl_init(void); > +void rdma_nl_exit(void); This hunk is in direct conflict with 233c1955 which you removed ibnl_init and ibnl_cleanup. Are you putting back the init and exit or do you want to leave them out? Chien -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html