]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
s390/qeth: don't erase configuration while probing
authorJulian Wiedmann <jwi@linux.ibm.com>
Mon, 18 Mar 2019 15:40:54 +0000 (16:40 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Mar 2019 01:34:45 +0000 (18:34 -0700)
The HW trap and VNICC configuration is exposed via sysfs, and may have
already been modified when qeth_l?_probe_device() attempts to initialize
them. So (1) initialize the VNICC values a little earlier, and (2) don't
bother about the HW trap mode, it was already initialized before.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/s390/net/qeth_l2_main.c
drivers/s390/net/qeth_l3_main.c

index 8efb2e8ff8f460adacd53376d5cddd3fc6953b03..3bfdd8545776b4bb074a3c85a909647f44d6344c 100644 (file)
@@ -645,6 +645,8 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)
        struct qeth_card *card = dev_get_drvdata(&gdev->dev);
        int rc;
 
+       qeth_l2_vnicc_set_defaults(card);
+
        if (gdev->dev.type == &qeth_generic_devtype) {
                rc = qeth_l2_create_device_attributes(&gdev->dev);
                if (rc)
@@ -652,8 +654,6 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)
        }
 
        hash_init(card->mac_htable);
-       card->info.hwtrap = 0;
-       qeth_l2_vnicc_set_defaults(card);
        return 0;
 }
 
index 7e68d9d16859d24eaae38d3f0a8079f40cbabdf2..2f002843b16eb8a24c7d441ddff6915d074645fb 100644 (file)
@@ -2260,7 +2260,6 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev)
        }
        hash_init(card->ip_htable);
        hash_init(card->ip_mc_htable);
-       card->info.hwtrap = 0;
        return 0;
 }