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

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

IB/{core, ipoib}: Simplify ib_find_gid() for unused ndev 



ib_find_gid() is only used by IPoIB driver. For IB link layer, GID table
entries are not based on netdevice. Netdevice parameter is unused here.
Therefore, it is removed.

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>
Reviewed-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 6612b498

drivers/infiniband/core/device.c

+1 −2
Original line number Diff line number Diff line
@@ -1050,13 +1050,12 @@ EXPORT_SYMBOL(ib_modify_port); 
 *   a specified GID value occurs. Its searches only for IB link layer.

 * @device: The device to query.

 * @gid: The GID value to search for.

 * @ndev: The ndev related to the GID to search for.

 * @port_num: The port number of the device where the GID value was found.

 * @index: The index into the GID table where the GID was found.  This

 *   parameter may be NULL.

 */

int ib_find_gid(struct ib_device *device, union ib_gid *gid,

		struct net_device *ndev, u8 *port_num, u16 *index)

		u8 *port_num, u16 *index)

{

	union ib_gid tmp_gid;

	int ret, port, i;

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+1 −1
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ static bool ipoib_dev_addr_changed_valid(struct ipoib_dev_priv *priv) 


	netif_addr_unlock_bh(priv->dev);



	err = ib_find_gid(priv->ca, &search_gid, priv->dev, &port, &index);

	err = ib_find_gid(priv->ca, &search_gid, &port, &index);



	netif_addr_lock_bh(priv->dev);

include/rdma/ib_verbs.h

+1 −1
Original line number Diff line number Diff line
@@ -2857,7 +2857,7 @@ int ib_modify_port(struct ib_device *device, 
		   struct ib_port_modify *port_modify);



int ib_find_gid(struct ib_device *device, union ib_gid *gid,

		struct net_device *ndev, u8 *port_num, u16 *index);

		u8 *port_num, u16 *index);



int ib_find_pkey(struct ib_device *device,

		 u8 port_num, u16 pkey, u16 *index);