Commit d8d5cfac authored by Kamal Heib's avatar Kamal Heib Committed by Doug Ledford
Browse files

RDMA/{cxgb3, cxgb4, i40iw}: Remove common code 



Now that we have a common iWARP query port function we can remove the
common code from the iWARP drivers.

Signed-off-by: default avatarKamal Heib <kamalheib1@gmail.com>
Acked-by: default avatarPotnuri Bharat Teja <bharat@chelsio.com>
Link: https://lore.kernel.org/r/20190807103138.17219-5-kamalheib1@gmail.com


Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 4929116b

drivers/infiniband/hw/cxgb3/iwch_provider.c

+0 −25
Original line number Diff line number Diff line
@@ -991,33 +991,8 @@ static int iwch_query_device(struct ib_device *ibdev, struct ib_device_attr *pro 
static int iwch_query_port(struct ib_device *ibdev,

			   u8 port, struct ib_port_attr *props)

{

	struct iwch_dev *dev;

	struct net_device *netdev;

	struct in_device *inetdev;



	pr_debug("%s ibdev %p\n", __func__, ibdev);



	dev = to_iwch_dev(ibdev);

	netdev = dev->rdev.port_info.lldevs[port-1];



	/* props being zeroed by the caller, avoid zeroing it here */

	props->max_mtu = IB_MTU_4096;

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



	if (!netif_carrier_ok(netdev))

		props->state = IB_PORT_DOWN;

	else {

		inetdev = in_dev_get(netdev);

		if (inetdev) {

			if (inetdev->ifa_list)

				props->state = IB_PORT_ACTIVE;

			else

				props->state = IB_PORT_INIT;

			in_dev_put(inetdev);

		} else

			props->state = IB_PORT_INIT;

	}



	props->port_cap_flags =

	    IB_PORT_CM_SUP |

	    IB_PORT_SNMP_TUNNEL_SUP |

drivers/infiniband/hw/cxgb4/provider.c

+0 −24
Original line number Diff line number Diff line
@@ -305,32 +305,8 @@ static int c4iw_query_device(struct ib_device *ibdev, struct ib_device_attr *pro 
static int c4iw_query_port(struct ib_device *ibdev, u8 port,

			   struct ib_port_attr *props)

{

	struct c4iw_dev *dev;

	struct net_device *netdev;

	struct in_device *inetdev;



	pr_debug("ibdev %p\n", ibdev);



	dev = to_c4iw_dev(ibdev);

	netdev = dev->rdev.lldi.ports[port-1];

	/* props being zeroed by the caller, avoid zeroing it here */

	props->max_mtu = IB_MTU_4096;

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



	if (!netif_carrier_ok(netdev))

		props->state = IB_PORT_DOWN;

	else {

		inetdev = in_dev_get(netdev);

		if (inetdev) {

			if (inetdev->ifa_list)

				props->state = IB_PORT_ACTIVE;

			else

				props->state = IB_PORT_INIT;

			in_dev_put(inetdev);

		} else

			props->state = IB_PORT_INIT;

	}



	props->port_cap_flags =

	    IB_PORT_CM_SUP |

	    IB_PORT_SNMP_TUNNEL_SUP |

drivers/infiniband/hw/i40iw/i40iw_verbs.c

+0 −11
Original line number Diff line number Diff line
@@ -97,18 +97,7 @@ static int i40iw_query_port(struct ib_device *ibdev, 
			    u8 port,

			    struct ib_port_attr *props)

{

	struct i40iw_device *iwdev = to_iwdev(ibdev);

	struct net_device *netdev = iwdev->netdev;



	/* props being zeroed by the caller, avoid zeroing it here */

	props->max_mtu = IB_MTU_4096;

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



	props->lid = 1;

	if (netif_carrier_ok(iwdev->netdev))

		props->state = IB_PORT_ACTIVE;

	else

		props->state = IB_PORT_DOWN;

	props->port_cap_flags = IB_PORT_CM_SUP | IB_PORT_REINIT_SUP |

		IB_PORT_VENDOR_CLASS_SUP | IB_PORT_BOOT_MGMT_SUP;

	props->gid_tbl_len = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE