From: "Petr Štetiar" <ynezz@true.cz>
To: netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>
Cc: "Heiner Kallweit" <hkallweit1@gmail.com>,
"Frank Rowand" <frowand.list@gmail.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Maxime Ripard" <maxime.ripard@bootlin.com>,
"Petr Štetiar" <ynezz@true.cz>
Subject: [PATCH net-next v2 2/4] net: dsa: support of_get_mac_address new ERR_PTR error
Date: Mon, 6 May 2019 23:24:45 +0200 [thread overview]
Message-ID: <1557177887-30446-3-git-send-email-ynezz@true.cz> (raw)
In-Reply-To: <1557177887-30446-1-git-send-email-ynezz@true.cz>
There was NVMEM support added to of_get_mac_address, so it could now
return ERR_PTR encoded error values, so we need to adjust all current
users of of_get_mac_address to this new fact.
While at it, remove superfluous is_valid_ether_addr as the MAC address
returned from of_get_mac_address is always valid and checked by
is_valid_ether_addr anyway.
Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---
net/dsa/slave.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 316bce9..fe7b6a6 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1418,7 +1418,7 @@ int dsa_slave_create(struct dsa_port *port)
NETIF_F_HW_VLAN_CTAG_FILTER;
slave_dev->hw_features |= NETIF_F_HW_TC;
slave_dev->ethtool_ops = &dsa_slave_ethtool_ops;
- if (port->mac && is_valid_ether_addr(port->mac))
+ if (!IS_ERR_OR_NULL(port->mac))
ether_addr_copy(slave_dev->dev_addr, port->mac);
else
eth_hw_addr_inherit(slave_dev, master);
--
1.9.1
next prev parent reply other threads:[~2019-05-06 21:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-06 21:24 [PATCH net-next v2 0/4] of_get_mac_address ERR_PTR fixes Petr Štetiar
2019-05-06 21:24 ` Petr Štetiar [this message]
2019-05-07 13:49 ` [PATCH net-next v2 2/4] net: dsa: support of_get_mac_address new ERR_PTR error Vladimir Oltean
2019-05-06 21:24 ` [PATCH net-next v2 3/4] staging: octeon-ethernet: Fix of_get_mac_address ERR_PTR check Petr Štetiar
2019-05-06 21:24 ` [PATCH net-next v2 4/4] net: usb: smsc: fix warning reported by kbuild test robot Petr Štetiar
2019-05-06 21:29 ` Woojung.Huh
2019-05-06 21:27 ` [PATCH net-next v2 1/4] net: ethernet: support of_get_mac_address new ERR_PTR error Petr Štetiar
2019-05-07 7:19 ` [PATCH net-next v2 0/4] of_get_mac_address ERR_PTR fixes Dan Carpenter
2019-05-07 7:41 ` Greg Kroah-Hartman
2019-05-07 8:39 ` Petr Štetiar
2019-05-07 9:01 ` netdev patchwork issues [Was: Re: [PATCH net-next v2 0/4] of_get_mac_address ERR_PTR fixes] Petr Štetiar
2019-05-07 9:44 ` [PATCH net-next v2 0/4] of_get_mac_address ERR_PTR fixes Dan Carpenter
2019-05-07 9:07 ` Geert Uytterhoeven
2019-05-07 12:14 ` Leonard Crestez
2019-05-07 19:23 ` 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=1557177887-30446-3-git-send-email-ynezz@true.cz \
--to=ynezz@true.cz \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devel@driverdev.osuosl.org \
--cc=f.fainelli@gmail.com \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.ripard@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@gmail.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