summaryrefslogtreecommitdiffstats
path: root/net/dsa/slave.c
diff options
context:
space:
mode:
authorDavid S. Miller2019-05-07 21:22:47 +0200
committerDavid S. Miller2019-05-07 21:22:47 +0200
commit2e7ae67b5fbbe596cb3e06410970945f975a241a (patch)
treefc9af6d5d1fbcaa88b0eb60e543da7cec1acd12b /net/dsa/slave.c
parentnet: dsa: sja1105: Fix status initialization in sja1105_get_ethtool_stats (diff)
parentnet: ethernet: support of_get_mac_address new ERR_PTR error (diff)
downloadkernel-qcow2-linux-2e7ae67b5fbbe596cb3e06410970945f975a241a.tar.gz
kernel-qcow2-linux-2e7ae67b5fbbe596cb3e06410970945f975a241a.tar.xz
kernel-qcow2-linux-2e7ae67b5fbbe596cb3e06410970945f975a241a.zip
Merge branch 'of_get_mac_address-ERR_PTR-fixes'
Petr Štetiar says: ==================== of_get_mac_address ERR_PTR fixes this patch series is an attempt to fix the mess, I've somehow managed to introduce. First patch in this series is defacto v5 of the previous 05/10 patch in the series, but since the v4 of this 05/10 patch wasn't picked up by the patchwork for some unknown reason, this patch wasn't applied with the other 9 patches in the series, so I'm resending it as a separate patch of this fixup series again. Second patch is a result of this rebase against net-next tree, where I was checking again all current users of of_get_mac_address and found out, that there's new one in DSA, so I've converted this user to the new ERR_PTR encoded error value as well. Third patch which was sent as v5 wasn't considered for merge, but I still think, that we need to check for possible NULL value, thus current IS_ERR check isn't sufficient and we need to use IS_ERR_OR_NULL instead. Fourth patch fixes warning reported by kbuild test robot. ==================== Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Tested-by: Leonard Crestez <leonard.crestez@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/slave.c')
-rw-r--r--net/dsa/slave.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 316bce9e0fbf..fe7b6a62e8f1 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);