net: stmmac: move initialisation of maxmtu to stmmac_plat_dat_alloc()

Move the default initialisation of plat_dat->maxmtu to JUMBO_LEN to
stmmac_plat_dat_alloc().

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vJvj5-0000000EVji-2EYA@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index 7e56fbc3e141ba4fcb862705df6f672fef6685bd..cf69e659c415056ea5c78d6c2207253d94e4075b 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -576,9 +576,6 @@ static void common_default_data(struct plat_stmmacenet_data *plat)
        /* Set default value for unicast filter entries */
        plat->unicast_filter_entries = 1;
 
-       /* Set the maxmtu to a default of JUMBO_LEN */
-       plat->maxmtu = JUMBO_LEN;
-
        /* Set default number of RX and TX queues to use */
        plat->tx_queues_to_use = 1;
        plat->rx_queues_to_use = 1;
@@ -712,9 +709,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
        /* Set default value for unicast filter entries */
        plat->unicast_filter_entries = 1;
 
-       /* Set the maxmtu to a default of JUMBO_LEN */
-       plat->maxmtu = JUMBO_LEN;
-
        plat->flags |= STMMAC_FLAG_VLAN_FAIL_Q_EN;
 
        /* Use the last Rx queue */

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index 8593411844bce4c057c249cfef10e10af1baacc4..89232c788c61c5878f4de57dde2c0f0a5b7733ba 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -101,9 +101,6 @@ static void loongson_default_data(struct pci_dev *pdev,
        /* Set default value for unicast filter entries */
        plat->unicast_filter_entries = 1;
 
-       /* Set the maxmtu to a default of JUMBO_LEN */
-       plat->maxmtu = JUMBO_LEN;
-
        /* Disable Priority config by default */
        plat->tx_queues_cfg[0].use_prio = false;
        plat->rx_queues_cfg[0].use_prio = false;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a36e8a90fcaad2fb2ce84e8cb5aad017c4789f37..0763ed06715efe227841bf4d609a650869c8bbc8 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7566,9 +7566,11 @@ struct plat_stmmacenet_data *stmmac_plat_dat_alloc(struct device *dev)
        /* Set the defaults:
         * - phy autodetection
         * - determine GMII_Address CR field from CSR clock
+        * - allow MTU up to JUMBO_LEN
         */
        plat_dat->phy_addr = -1;
        plat_dat->clk_csr = -1;
+       plat_dat->maxmtu = JUMBO_LEN;
 
        return plat_dat;
 }

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index b981a9dd511df482d5c2d8b513d681190bd63a47..b0b4358e0adfc9f4ae36b3ae42f018fc01160f71 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -34,9 +34,6 @@ static void common_default_data(struct plat_stmmacenet_data *plat)
        /* Set default value for unicast filter entries */
        plat->unicast_filter_entries = 1;
 
-       /* Set the maxmtu to a default of JUMBO_LEN */
-       plat->maxmtu = JUMBO_LEN;
-
        /* Set default number of RX and TX queues to use */
        plat->tx_queues_to_use = 1;
        plat->rx_queues_to_use = 1;
@@ -87,9 +84,6 @@ static int snps_gmac5_default_data(struct pci_dev *pdev,
        /* Set default value for unicast filter entries */
        plat->unicast_filter_entries = 1;
 
-       /* Set the maxmtu to a default of JUMBO_LEN */
-       plat->maxmtu = JUMBO_LEN;
-
        /* Set default number of RX and TX queues to use */
        plat->tx_queues_to_use = 4;
        plat->rx_queues_to_use = 4;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index fe3d95274fd6b918c2aeed35cc8eebe0d20b508f..81a599475577a01b9697d333fb91ff6218d071b7 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -508,11 +508,6 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
                plat->flags |= STMMAC_FLAG_EN_TX_LPI_CLOCKGATING;
        }
 
-       /* Set the maxmtu to a default of JUMBO_LEN in case the
-        * parameter is not present in the device tree.
-        */
-       plat->maxmtu = JUMBO_LEN;
-
        /* Set default value for multicast hash bins */
        plat->multicast_filter_bins = HASH_TABLE_SIZE;