OSDN Git Service

net: dsa: use the ETH_MIN_MTU and ETH_DATA_LEN default values
authorVladimir Oltean <olteanv@gmail.com>
Sat, 18 Jul 2020 18:04:18 +0000 (21:04 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Jul 2020 01:35:04 +0000 (18:35 -0700)
Now that DSA supports MTU configuration, undo the effects of commit
8b1efc0f83f1 ("net: remove MTU limits on a few ether_setup callers") and
let DSA interfaces use the default min_mtu and max_mtu specified by
ether_setup(). This is more important for min_mtu: since DSA is
Ethernet, the minimum MTU is the same as of any other Ethernet
interface, and definitely not zero. For the max_mtu, we have a callback
through which drivers can override that, if they want to.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/dsa/slave.c

index e147e10..41d60ee 100644 (file)
@@ -1754,11 +1754,8 @@ int dsa_slave_create(struct dsa_port *port)
                eth_hw_addr_inherit(slave_dev, master);
        slave_dev->priv_flags |= IFF_NO_QUEUE;
        slave_dev->netdev_ops = &dsa_slave_netdev_ops;
-       slave_dev->min_mtu = 0;
        if (ds->ops->port_max_mtu)
                slave_dev->max_mtu = ds->ops->port_max_mtu(ds, port->index);
-       else
-               slave_dev->max_mtu = ETH_MAX_MTU;
        SET_NETDEV_DEVTYPE(slave_dev, &dsa_type);
 
        netdev_for_each_tx_queue(slave_dev, dsa_slave_set_lockdep_class_one,