diff options
| author | David S. Miller | 2018-07-21 19:12:30 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-07-21 19:12:30 +0200 |
| commit | 975cd350c270328b784326d124b7a6607542e053 (patch) | |
| tree | bae78d7a1eca3196a41a4bdb0aa44dd08a6b7a4e /drivers/s390/net/qeth_l3_sys.c | |
| parent | Merge branch 'hns3-misc-cleanups' (diff) | |
| parent | s390/qeth: speed up L2 IQD xmit (diff) | |
| download | kernel-qcow2-linux-975cd350c270328b784326d124b7a6607542e053.tar.gz kernel-qcow2-linux-975cd350c270328b784326d124b7a6607542e053.tar.xz kernel-qcow2-linux-975cd350c270328b784326d124b7a6607542e053.zip | |
Merge branch 's390-qeth-updates'
Julian Wiedmann says:
====================
s390/qeth: updates 2018-07-19
please apply one more round of qeth patches to net-next.
This brings additional performance improvements for the transmit code,
and some refactoring to pave the way for using netdev_priv.
Also, two minor fixes for rare corner cases.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_l3_sys.c')
| -rw-r--r-- | drivers/s390/net/qeth_l3_sys.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c index f61192a048f4..45ac6d8705c6 100644 --- a/drivers/s390/net/qeth_l3_sys.c +++ b/drivers/s390/net/qeth_l3_sys.c @@ -299,8 +299,7 @@ static ssize_t qeth_l3_dev_hsuid_store(struct device *dev, if (strlen(tmp) == 0) { /* delete ip address only */ card->options.hsuid[0] = '\0'; - if (card->dev) - memcpy(card->dev->perm_addr, card->options.hsuid, 9); + memcpy(card->dev->perm_addr, card->options.hsuid, 9); qeth_configure_cq(card, QETH_CQ_DISABLED); return count; } @@ -311,8 +310,7 @@ static ssize_t qeth_l3_dev_hsuid_store(struct device *dev, snprintf(card->options.hsuid, sizeof(card->options.hsuid), "%-8s", tmp); ASCEBC(card->options.hsuid, 8); - if (card->dev) - memcpy(card->dev->perm_addr, card->options.hsuid, 9); + memcpy(card->dev->perm_addr, card->options.hsuid, 9); rc = qeth_l3_modify_hsuid(card, true); |