diff options
| author | Julian Wiedmann | 2019-02-28 18:59:44 +0100 |
|---|---|---|
| committer | David S. Miller | 2019-02-28 21:55:26 +0100 |
| commit | 0f7aedbdf2bb92cf1a3462561b3ff4c3a42bfe7d (patch) | |
| tree | 2f190d0f4267ae5d9dce3233a643b57a33362c9a /drivers/s390/net/qeth_core_sys.c | |
| parent | s390/qeth: don't special-case HW trap during suspend (diff) | |
| download | kernel-qcow2-linux-0f7aedbdf2bb92cf1a3462561b3ff4c3a42bfe7d.tar.gz kernel-qcow2-linux-0f7aedbdf2bb92cf1a3462561b3ff4c3a42bfe7d.tar.xz kernel-qcow2-linux-0f7aedbdf2bb92cf1a3462561b3ff4c3a42bfe7d.zip | |
s390/qeth: drop redundant state checking
Now that qeth always uses dev_close() to shutdown the interface, we can
trust the locking and remove some custom state checks.
qeth_l?_stop_card() is no longer called for a card in UP state, so remove
the checks there too. This basically makes the UP state obsolete, so rip
out the whole thing (except for the sysfs-visible string).
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_core_sys.c')
| -rw-r--r-- | drivers/s390/net/qeth_core_sys.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c index fa575549d288..56deeb6f7bc0 100644 --- a/drivers/s390/net/qeth_core_sys.c +++ b/drivers/s390/net/qeth_core_sys.c @@ -29,11 +29,11 @@ static ssize_t qeth_dev_state_show(struct device *dev, case CARD_STATE_HARDSETUP: return sprintf(buf, "HARDSETUP\n"); case CARD_STATE_SOFTSETUP: + if (card->dev->flags & IFF_UP) + return sprintf(buf, "UP (LAN %s)\n", + netif_carrier_ok(card->dev) ? "ONLINE" : + "OFFLINE"); return sprintf(buf, "SOFTSETUP\n"); - case CARD_STATE_UP: - return sprintf(buf, "UP (LAN %s)\n", - netif_carrier_ok(card->dev) ? "ONLINE" : - "OFFLINE"); default: return sprintf(buf, "UNKNOWN\n"); } |