From: Julian Wiedmann <jwi@linux.ibm.com>
To: David Miller <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <linux-s390@vger.kernel.org>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Stefan Raspl <raspl@linux.ibm.com>,
Ursula Braun <ubraun@linux.ibm.com>,
Julian Wiedmann <jwi@linux.ibm.com>
Subject: [PATCH net-next 8/8] s390/qeth: don't process hsuid in qeth_l3_setup_netdev()
Date: Thu, 8 Nov 2018 15:06:22 +0100 [thread overview]
Message-ID: <20181108140622.35244-9-jwi@linux.ibm.com> (raw)
In-Reply-To: <20181108140622.35244-1-jwi@linux.ibm.com>
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>
---
drivers/s390/net/qeth_l3_main.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 674ff3344ff3..eca68da39d05 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -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;
--
2.16.4
next prev parent reply other threads:[~2018-11-08 23:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-08 14:06 [PATCH net-next 0/8] s390/qeth: updates 2018-11-08 Julian Wiedmann
2018-11-08 14:06 ` [PATCH net-next 1/8] s390/qeth: utilize virtual MAC for Layer2 OSD devices Julian Wiedmann
2018-11-08 14:06 ` [PATCH net-next 2/8] s390/qeth: handle af_iucv skbs in qeth_l3_fill_header() Julian Wiedmann
2018-11-08 14:06 ` [PATCH net-next 3/8] s390/qeth: unify transmit code Julian Wiedmann
2018-11-08 14:06 ` [PATCH net-next 4/8] s390/qeth: remove card list Julian Wiedmann
2018-11-08 14:06 ` [PATCH net-next 5/8] s390/qeth: replace open-coded cmd setup Julian Wiedmann
2018-11-08 14:06 ` [PATCH net-next 6/8] s390/qeth: remove two IPA command helpers Julian Wiedmann
2018-11-08 14:06 ` [PATCH net-next 7/8] s390/qeth: remove unused fallback in Layer3's MAC code Julian Wiedmann
2018-11-08 14:06 ` Julian Wiedmann [this message]
2018-11-09 1:23 ` [PATCH net-next 0/8] s390/qeth: updates 2018-11-08 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181108140622.35244-9-jwi@linux.ibm.com \
--to=jwi@linux.ibm.com \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=raspl@linux.ibm.com \
--cc=schwidefsky@de.ibm.com \
--cc=ubraun@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).