OSDN Git Service

s390/qeth: don't process hsuid in qeth_l3_setup_netdev()
authorJulian Wiedmann <jwi@linux.ibm.com>
Thu, 8 Nov 2018 14:06:22 +0000 (15:06 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Nov 2018 01:22:24 +0000 (17:22 -0800)
qeth_l3_setup_netdev() checks if the hsuid attribute is set on the qeth
device, and propagates it to the net_device. In the past this was needed
to pick up any hsuid that was set before allocation of the net_device.

With commit d3d1b205e89f ("s390/qeth: allocate netdevice early") this
is no longer necessary, qeth_l3_dev_hsuid_store() always stores the
hsuid straight into dev->perm_addr.

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

index 674ff33..eca68da 100644 (file)
@@ -2279,9 +2279,6 @@ static int qeth_l3_setup_netdev(struct qeth_card *card, bool carrier_ok)
                rc = qeth_l3_iqd_read_initial_mac(card);
                if (rc)
                        goto out;
-
-               if (card->options.hsuid[0])
-                       memcpy(card->dev->perm_addr, card->options.hsuid, 9);
        } else
                return -ENODEV;