s390/qeth: convert to ETHTOOL_GLINKSETTINGS API (993e19c0) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/s390/net/qeth_core.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -958,7 +958,8 @@ void qeth_core_get_ethtool_stats(struct net_device *,
	void qeth_core_get_strings(struct net_device , u32, u8 );		void qeth_core_get_strings(struct net_device , u32, u8 );
	void qeth_core_get_drvinfo(struct net_device , struct ethtool_drvinfo );		void qeth_core_get_drvinfo(struct net_device , struct ethtool_drvinfo );
	void qeth_dbf_longtext(debug_info_t id, int level, char text, ...);		void qeth_dbf_longtext(debug_info_t id, int level, char text, ...);
	int qeth_core_ethtool_get_settings(struct net_device , struct ethtool_cmd );		int qeth_core_ethtool_get_link_ksettings(struct net_device *netdev,
			struct ethtool_link_ksettings *cmd);
	int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback);		int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback);
	int qeth_hdr_chk_and_bounce(struct sk_buff , struct qeth_hdr *, int);		int qeth_hdr_chk_and_bounce(struct sk_buff , struct qeth_hdr *, int);
	int qeth_configure_cq(struct qeth_card *, enum qeth_cq);		int qeth_configure_cq(struct qeth_card *, enum qeth_cq);

drivers/s390/net/qeth_core_main.c

+36 −39

Original line number	Original line	Diff line number	Diff line
	@@ -6028,7 +6028,7 @@ EXPORT_SYMBOL_GPL(qeth_core_get_drvinfo);
	/* Autoneg and full-duplex are supported and advertised unconditionally. */		/* Autoneg and full-duplex are supported and advertised unconditionally. */
	/* Always advertise and support all speeds up to specified, and only one */		/* Always advertise and support all speeds up to specified, and only one */
	/* specified port type. */		/* specified port type. */
	static void qeth_set_ecmd_adv_sup(struct ethtool_cmd *ecmd,		static void qeth_set_cmd_adv_sup(struct ethtool_link_ksettings *cmd,
	int maxspeed, int porttype)		int maxspeed, int porttype)
	{		{
	u32 sup, adv;		u32 sup, adv;
	@@ -6072,55 +6072,53 @@ static void qeth_set_ecmd_adv_sup(struct ethtool_cmd *ecmd,
	adv \|= ADVERTISED_10baseT_Half \| ADVERTISED_10baseT_Full;		adv \|= ADVERTISED_10baseT_Half \| ADVERTISED_10baseT_Full;
	WARN_ON_ONCE(1);		WARN_ON_ONCE(1);
	}		}
	ecmd->supported = sup;
	ecmd->advertising = adv;		ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,
			sup);
			ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.advertising,
			adv);
	}		}

	int qeth_core_ethtool_get_settings(struct net_device *netdev,		int qeth_core_ethtool_get_link_ksettings(struct net_device *netdev,
	struct ethtool_cmd *ecmd)		struct ethtool_link_ksettings *cmd)
	{		{
	struct qeth_card *card = netdev->ml_priv;		struct qeth_card *card = netdev->ml_priv;
	enum qeth_link_types link_type;		enum qeth_link_types link_type;
	struct carrier_info carrier_info;		struct carrier_info carrier_info;
	int rc;		int rc;
	u32 speed;

	if ((card->info.type == QETH_CARD_TYPE_IQD) \|\| (card->info.guestlan))		if ((card->info.type == QETH_CARD_TYPE_IQD) \|\| (card->info.guestlan))
	link_type = QETH_LINK_TYPE_10GBIT_ETH;		link_type = QETH_LINK_TYPE_10GBIT_ETH;
	else		else
	link_type = card->info.link_type;		link_type = card->info.link_type;

	ecmd->transceiver = XCVR_INTERNAL;		cmd->base.duplex = DUPLEX_FULL;
	ecmd->duplex = DUPLEX_FULL;		cmd->base.autoneg = AUTONEG_ENABLE;
	ecmd->autoneg = AUTONEG_ENABLE;		cmd->base.phy_address = 0;
			cmd->base.mdio_support = 0;
			cmd->base.eth_tp_mdix = ETH_TP_MDI_INVALID;
			cmd->base.eth_tp_mdix_ctrl = ETH_TP_MDI_INVALID;

	switch (link_type) {		switch (link_type) {
	case QETH_LINK_TYPE_FAST_ETH:		case QETH_LINK_TYPE_FAST_ETH:
	case QETH_LINK_TYPE_LANE_ETH100:		case QETH_LINK_TYPE_LANE_ETH100:
	qeth_set_ecmd_adv_sup(ecmd, SPEED_100, PORT_TP);		cmd->base.speed = SPEED_100;
	speed = SPEED_100;		cmd->base.port = PORT_TP;
	ecmd->port = PORT_TP;
	break;		break;

	case QETH_LINK_TYPE_GBIT_ETH:		case QETH_LINK_TYPE_GBIT_ETH:
	case QETH_LINK_TYPE_LANE_ETH1000:		case QETH_LINK_TYPE_LANE_ETH1000:
	qeth_set_ecmd_adv_sup(ecmd, SPEED_1000, PORT_FIBRE);		cmd->base.speed = SPEED_1000;
	speed = SPEED_1000;		cmd->base.port = PORT_FIBRE;
	ecmd->port = PORT_FIBRE;
	break;		break;

	case QETH_LINK_TYPE_10GBIT_ETH:		case QETH_LINK_TYPE_10GBIT_ETH:
	qeth_set_ecmd_adv_sup(ecmd, SPEED_10000, PORT_FIBRE);		cmd->base.speed = SPEED_10000;
	speed = SPEED_10000;		cmd->base.port = PORT_FIBRE;
	ecmd->port = PORT_FIBRE;
	break;		break;

	default:		default:
	qeth_set_ecmd_adv_sup(ecmd, SPEED_10, PORT_TP);		cmd->base.speed = SPEED_10;
	speed = SPEED_10;		cmd->base.port = PORT_TP;
	ecmd->port = PORT_TP;
	}		}
	ethtool_cmd_speed_set(ecmd, speed);		qeth_set_cmd_adv_sup(cmd, cmd->base.speed, cmd->base.port);

	/* Check if we can obtain more accurate information. */		/* Check if we can obtain more accurate information. */
	/* If QUERY_CARD_INFO command is not supported or fails, */		/* If QUERY_CARD_INFO command is not supported or fails, */
	@@ -6145,49 +6143,48 @@ int qeth_core_ethtool_get_settings(struct net_device *netdev,
	switch (carrier_info.card_type) {		switch (carrier_info.card_type) {
	case CARD_INFO_TYPE_1G_COPPER_A:		case CARD_INFO_TYPE_1G_COPPER_A:
	case CARD_INFO_TYPE_1G_COPPER_B:		case CARD_INFO_TYPE_1G_COPPER_B:
	qeth_set_ecmd_adv_sup(ecmd, SPEED_1000, PORT_TP);		cmd->base.port = PORT_TP;
	ecmd->port = PORT_TP;		qeth_set_cmd_adv_sup(cmd, SPEED_1000, cmd->base.port);
	break;		break;
	case CARD_INFO_TYPE_1G_FIBRE_A:		case CARD_INFO_TYPE_1G_FIBRE_A:
	case CARD_INFO_TYPE_1G_FIBRE_B:		case CARD_INFO_TYPE_1G_FIBRE_B:
	qeth_set_ecmd_adv_sup(ecmd, SPEED_1000, PORT_FIBRE);		cmd->base.port = PORT_FIBRE;
	ecmd->port = PORT_FIBRE;		qeth_set_cmd_adv_sup(cmd, SPEED_1000, cmd->base.port);
	break;		break;
	case CARD_INFO_TYPE_10G_FIBRE_A:		case CARD_INFO_TYPE_10G_FIBRE_A:
	case CARD_INFO_TYPE_10G_FIBRE_B:		case CARD_INFO_TYPE_10G_FIBRE_B:
	qeth_set_ecmd_adv_sup(ecmd, SPEED_10000, PORT_FIBRE);		cmd->base.port = PORT_FIBRE;
	ecmd->port = PORT_FIBRE;		qeth_set_cmd_adv_sup(cmd, SPEED_10000, cmd->base.port);
	break;		break;
	}		}

	switch (carrier_info.port_mode) {		switch (carrier_info.port_mode) {
	case CARD_INFO_PORTM_FULLDUPLEX:		case CARD_INFO_PORTM_FULLDUPLEX:
	ecmd->duplex = DUPLEX_FULL;		cmd->base.duplex = DUPLEX_FULL;
	break;		break;
	case CARD_INFO_PORTM_HALFDUPLEX:		case CARD_INFO_PORTM_HALFDUPLEX:
	ecmd->duplex = DUPLEX_HALF;		cmd->base.duplex = DUPLEX_HALF;
	break;		break;
	}		}

	switch (carrier_info.port_speed) {		switch (carrier_info.port_speed) {
	case CARD_INFO_PORTS_10M:		case CARD_INFO_PORTS_10M:
	speed = SPEED_10;		cmd->base.speed = SPEED_10;
	break;		break;
	case CARD_INFO_PORTS_100M:		case CARD_INFO_PORTS_100M:
	speed = SPEED_100;		cmd->base.speed = SPEED_100;
	break;		break;
	case CARD_INFO_PORTS_1G:		case CARD_INFO_PORTS_1G:
	speed = SPEED_1000;		cmd->base.speed = SPEED_1000;
	break;		break;
	case CARD_INFO_PORTS_10G:		case CARD_INFO_PORTS_10G:
	speed = SPEED_10000;		cmd->base.speed = SPEED_10000;
	break;		break;
	}		}
	ethtool_cmd_speed_set(ecmd, speed);

	return 0;		return 0;
	}		}
	EXPORT_SYMBOL_GPL(qeth_core_ethtool_get_settings);		EXPORT_SYMBOL_GPL(qeth_core_ethtool_get_link_ksettings);

	/* Callback to handle checksum offload command reply from OSA card.		/* Callback to handle checksum offload command reply from OSA card.
	* Verify that required features have been enabled on the card.		* Verify that required features have been enabled on the card.

drivers/s390/net/qeth_l2_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -917,7 +917,7 @@ static const struct ethtool_ops qeth_l2_ethtool_ops = {
	.get_ethtool_stats = qeth_core_get_ethtool_stats,		.get_ethtool_stats = qeth_core_get_ethtool_stats,
	.get_sset_count = qeth_core_get_sset_count,		.get_sset_count = qeth_core_get_sset_count,
	.get_drvinfo = qeth_core_get_drvinfo,		.get_drvinfo = qeth_core_get_drvinfo,
	.get_settings = qeth_core_ethtool_get_settings,		.get_link_ksettings = qeth_core_ethtool_get_link_ksettings,
	};		};

	static const struct ethtool_ops qeth_l2_osn_ops = {		static const struct ethtool_ops qeth_l2_osn_ops = {

drivers/s390/net/qeth_l3_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2912,7 +2912,7 @@ static const struct ethtool_ops qeth_l3_ethtool_ops = {
	.get_ethtool_stats = qeth_core_get_ethtool_stats,		.get_ethtool_stats = qeth_core_get_ethtool_stats,
	.get_sset_count = qeth_core_get_sset_count,		.get_sset_count = qeth_core_get_sset_count,
	.get_drvinfo = qeth_core_get_drvinfo,		.get_drvinfo = qeth_core_get_drvinfo,
	.get_settings = qeth_core_ethtool_get_settings,		.get_link_ksettings = qeth_core_ethtool_get_link_ksettings,
	};		};

	/*		/*