Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 115b68aa authored by Parav Pandit's avatar Parav Pandit Committed by Jason Gunthorpe
Browse files

IB/ocrdma: Removed GID add/del null routines 



add_gid() and del_gid() are optional callback routines.
ib_core ignores invoking them while updating GID table entries if
they are not implemented by provider drivers. Therefore remove them.

Reviewed-by: default avatarDaniel Jurgens <danielj@mellanox.com>
Reviewed-by: default avatarMark Bloch <markb@mellanox.com>
Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent a9c06aeb

drivers/infiniband/hw/ocrdma/ocrdma_main.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -160,8 +160,6 @@ static int ocrdma_register_device(struct ocrdma_dev *dev) 
	dev->ibdev.modify_port = ocrdma_modify_port;

	dev->ibdev.modify_port = ocrdma_modify_port;

	dev->ibdev.query_gid = ocrdma_query_gid;

	dev->ibdev.query_gid = ocrdma_query_gid;

	dev->ibdev.get_netdev = ocrdma_get_netdev;

	dev->ibdev.get_netdev = ocrdma_get_netdev;

	dev->ibdev.add_gid = ocrdma_add_gid;

	dev->ibdev.del_gid = ocrdma_del_gid;

	dev->ibdev.get_link_layer = ocrdma_link_layer;

	dev->ibdev.get_link_layer = ocrdma_link_layer;

	dev->ibdev.alloc_pd = ocrdma_alloc_pd;

	dev->ibdev.alloc_pd = ocrdma_alloc_pd;

	dev->ibdev.dealloc_pd = ocrdma_dealloc_pd;

	dev->ibdev.dealloc_pd = ocrdma_dealloc_pd;

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c

+0 −16
Original line number Original line Diff line number Diff line
@@ -80,22 +80,6 @@ int ocrdma_query_gid(struct ib_device *ibdev, u8 port, 
	return ret;

	return ret;

}

}





int ocrdma_add_gid(struct ib_device *device,

		   u8 port_num,

		   unsigned int index,

		   const union ib_gid *gid,

		   const struct ib_gid_attr *attr,

		   void **context) {

	return  0;

}



int  ocrdma_del_gid(struct ib_device *device,

		    u8 port_num,

		    unsigned int index,

		    void **context) {

	return 0;

}



int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr,

int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr,

			struct ib_udata *uhw)

			struct ib_udata *uhw)

{

{

drivers/infiniband/hw/ocrdma/ocrdma_verbs.h

+0 −10
Original line number Original line Diff line number Diff line
@@ -64,16 +64,6 @@ void ocrdma_get_guid(struct ocrdma_dev *, u8 *guid); 
int ocrdma_query_gid(struct ib_device *, u8 port,

int ocrdma_query_gid(struct ib_device *, u8 port,

		     int index, union ib_gid *gid);

		     int index, union ib_gid *gid);

struct net_device *ocrdma_get_netdev(struct ib_device *device, u8 port_num);

struct net_device *ocrdma_get_netdev(struct ib_device *device, u8 port_num);

int ocrdma_add_gid(struct ib_device *device,

		   u8 port_num,

		   unsigned int index,

		   const union ib_gid *gid,

		   const struct ib_gid_attr *attr,

		   void **context);

int  ocrdma_del_gid(struct ib_device *device,

		    u8 port_num,

		    unsigned int index,

		    void **context);

int ocrdma_query_pkey(struct ib_device *, u8 port, u16 index, u16 *pkey);

int ocrdma_query_pkey(struct ib_device *, u8 port, u16 index, u16 *pkey);





struct ib_ucontext *ocrdma_alloc_ucontext(struct ib_device *,

struct ib_ucontext *ocrdma_alloc_ucontext(struct ib_device *,