diff options
author | David S. Miller <davem@davemloft.net> | 2020-04-25 19:24:42 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-04-25 20:18:53 -0700 |
commit | d483389678f9e03d53f226641ea39679debcbc81 (patch) | |
tree | e33c9e59627e806ef97be9ef66c48afb1e4ab393 /net/dsa | |
parent | 6033cebdfff9b10192eb254e8cc60fedd595ea7f (diff) | |
parent | b2768df24ec400dd4f7fa79542f797e904812053 (diff) | |
download | linux-d483389678f9e03d53f226641ea39679debcbc81.tar.gz linux-d483389678f9e03d53f226641ea39679debcbc81.tar.bz2 linux-d483389678f9e03d53f226641ea39679debcbc81.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Simple overlapping changes to linux/vermagic.h
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
-rw-r--r-- | net/dsa/slave.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 1035230771ae..ba8bf90dc0cc 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1777,11 +1777,9 @@ int dsa_slave_create(struct dsa_port *port) rtnl_lock(); ret = dsa_slave_change_mtu(slave_dev, ETH_DATA_LEN); rtnl_unlock(); - if (ret && ret != -EOPNOTSUPP) { - dev_err(ds->dev, "error %d setting MTU on port %d\n", - ret, port->index); - goto out_free; - } + if (ret) + dev_warn(ds->dev, "nonfatal error %d setting MTU on port %d\n", + ret, port->index); netif_carrier_off(slave_dev); |