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>
This commit is contained in:
@@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user