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

Commit d3f4aadd authored by Amrani, Ram's avatar Amrani, Ram Committed by Doug Ledford
Browse files

RDMA/core: Add the function ib_mtu_int_to_enum 



As the functionality to convert the MTU from a number to enum_ib_mtu
is ubiquitous, define a dedicated function and remove the duplicated
code.

Signed-off-by: default avatarRam Amrani <Ram.Amrani@cavium.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent ff89b070

drivers/infiniband/hw/cxgb3/iwch_provider.c

+1 −10
Original line number Diff line number Diff line
@@ -1135,16 +1135,7 @@ static int iwch_query_port(struct ib_device *ibdev, 


	memset(props, 0, sizeof(struct ib_port_attr));

	props->max_mtu = IB_MTU_4096;

	if (netdev->mtu >= 4096)

		props->active_mtu = IB_MTU_4096;

	else if (netdev->mtu >= 2048)

		props->active_mtu = IB_MTU_2048;

	else if (netdev->mtu >= 1024)

		props->active_mtu = IB_MTU_1024;

	else if (netdev->mtu >= 512)

		props->active_mtu = IB_MTU_512;

	else

		props->active_mtu = IB_MTU_256;

	props->active_mtu = ib_mtu_int_to_enum(netdev->mtu);



	if (!netif_carrier_ok(netdev))

		props->state = IB_PORT_DOWN;

drivers/infiniband/hw/cxgb4/provider.c

+1 −10
Original line number Diff line number Diff line
@@ -373,16 +373,7 @@ static int c4iw_query_port(struct ib_device *ibdev, u8 port, 


	memset(props, 0, sizeof(struct ib_port_attr));

	props->max_mtu = IB_MTU_4096;

	if (netdev->mtu >= 4096)

		props->active_mtu = IB_MTU_4096;

	else if (netdev->mtu >= 2048)

		props->active_mtu = IB_MTU_2048;

	else if (netdev->mtu >= 1024)

		props->active_mtu = IB_MTU_1024;

	else if (netdev->mtu >= 512)

		props->active_mtu = IB_MTU_512;

	else

		props->active_mtu = IB_MTU_256;

	props->active_mtu = ib_mtu_int_to_enum(netdev->mtu);



	if (!netif_carrier_ok(netdev))

		props->state = IB_PORT_DOWN;

drivers/infiniband/hw/i40iw/i40iw_verbs.c

+1 −10
Original line number Diff line number Diff line
@@ -100,16 +100,7 @@ static int i40iw_query_port(struct ib_device *ibdev, 
	memset(props, 0, sizeof(*props));



	props->max_mtu = IB_MTU_4096;

	if (netdev->mtu >= 4096)

		props->active_mtu = IB_MTU_4096;

	else if (netdev->mtu >= 2048)

		props->active_mtu = IB_MTU_2048;

	else if (netdev->mtu >= 1024)

		props->active_mtu = IB_MTU_1024;

	else if (netdev->mtu >= 512)

		props->active_mtu = IB_MTU_512;

	else

		props->active_mtu = IB_MTU_256;

	props->active_mtu = ib_mtu_int_to_enum(netdev->mtu);



	props->lid = 1;

	if (netif_carrier_ok(iwdev->netdev))

drivers/infiniband/hw/nes/nes_verbs.c

+1 −11
Original line number Diff line number Diff line
@@ -478,17 +478,7 @@ static int nes_query_port(struct ib_device *ibdev, u8 port, struct ib_port_attr 
	memset(props, 0, sizeof(*props));



	props->max_mtu = IB_MTU_4096;



	if (netdev->mtu  >= 4096)

		props->active_mtu = IB_MTU_4096;

	else if (netdev->mtu  >= 2048)

		props->active_mtu = IB_MTU_2048;

	else if (netdev->mtu  >= 1024)

		props->active_mtu = IB_MTU_1024;

	else if (netdev->mtu  >= 512)

		props->active_mtu = IB_MTU_512;

	else

		props->active_mtu = IB_MTU_256;

	props->active_mtu = ib_mtu_int_to_enum(netdev->mtu);



	props->lid = 1;

	props->lmc = 0;

include/rdma/ib_verbs.h

+14 −0
Original line number Diff line number Diff line
@@ -352,6 +352,20 @@ static inline int ib_mtu_enum_to_int(enum ib_mtu mtu) 
	}

}



static inline enum ib_mtu ib_mtu_int_to_enum(int mtu)

{

	if (mtu >= 4096)

		return IB_MTU_4096;

	else if (mtu >= 2048)

		return IB_MTU_2048;

	else if (mtu >= 1024)

		return IB_MTU_1024;

	else if (mtu >= 512)

		return IB_MTU_512;

	else

		return IB_MTU_256;

}



enum ib_port_state {

	IB_PORT_NOP		= 0,

	IB_PORT_DOWN		= 1,