Commit 88ad4d9b authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Jakub Kicinski

s390/qeth: tolerate error when querying card info

By the time that our .get_link_ksettings() code issues a QUERY CARD INFO
cmd to get link-related information, we already set up a good amount of
static link data.

Return this data when the cmd fails, same as when the cmd is not
supported.
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 215d2836
...@@ -413,7 +413,6 @@ static int qeth_get_link_ksettings(struct net_device *netdev, ...@@ -413,7 +413,6 @@ static int qeth_get_link_ksettings(struct net_device *netdev,
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;
if (IS_IQD(card) || IS_VM_NIC(card)) if (IS_IQD(card) || IS_VM_NIC(card))
link_type = QETH_LINK_TYPE_10GBIT_ETH; link_type = QETH_LINK_TYPE_10GBIT_ETH;
...@@ -455,12 +454,8 @@ static int qeth_get_link_ksettings(struct net_device *netdev, ...@@ -455,12 +454,8 @@ static int qeth_get_link_ksettings(struct net_device *netdev,
/* 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, */
/* just return the heuristics that was filled above. */ /* just return the heuristics that was filled above. */
rc = qeth_query_card_info(card, &carrier_info); if (qeth_query_card_info(card, &carrier_info))
if (rc == -EOPNOTSUPP) /* for old hardware, return heuristic */
return 0; return 0;
if (rc) /* report error from the hardware operation */
return rc;
/* on success, fill in the information got from the hardware */
netdev_dbg(netdev, netdev_dbg(netdev,
"card info: card_type=0x%02x, port_mode=0x%04x, port_speed=0x%08x\n", "card info: card_type=0x%02x, port_mode=0x%04x, port_speed=0x%08x\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment