net: hinic: Set max_mtu/min_mtu directly to simplify the code.

Set max_mtu/min_mtu directly to avoid making the validity judgment
when set mtu, because the judgment is made in net/core: dev_validate_mtu,
so to simplify the code.

Signed-off-by: caihuoqing <cai.huoqing@linux.dev>
Link: https://lore.kernel.org/r/20221024103349.4494-1-cai.huoqing@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_dev.h b/drivers/net/ethernet/huawei/hinic/hinic_dev.h
index a4fbf44f944cd37e39afe3270267d71b90268987..52ea97c818b8ec0190c1b2bf6a8259cf382645ab 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_dev.h
+++ b/drivers/net/ethernet/huawei/hinic/hinic_dev.h
@@ -22,6 +22,10 @@
 
 #define LP_PKT_CNT             64
 
+#define HINIC_MAX_JUMBO_FRAME_SIZE      15872
+#define HINIC_MAX_MTU_SIZE      (HINIC_MAX_JUMBO_FRAME_SIZE - ETH_HLEN - ETH_FCS_LEN)
+#define HINIC_MIN_MTU_SIZE      256
+
 enum hinic_flags {
        HINIC_LINK_UP = BIT(0),
        HINIC_INTF_UP = BIT(1),

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c
index e1f54a2f28b2214a56627fff67030a791b20a250..9d4d795e108145025497a9392e73c4d410964588 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_main.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c
@@ -1187,7 +1187,8 @@ static int nic_dev_init(struct pci_dev *pdev)
        else
                netdev->netdev_ops = &hinicvf_netdev_ops;
 
-       netdev->max_mtu = ETH_MAX_MTU;
+       netdev->max_mtu = HINIC_MAX_MTU_SIZE;
+       netdev->min_mtu = HINIC_MIN_MTU_SIZE;
 
        nic_dev = netdev_priv(netdev);
        nic_dev->netdev = netdev;

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_port.c b/drivers/net/ethernet/huawei/hinic/hinic_port.c
index 28ae6f1201a8b16406e76515bdaca2eda53101c6..0a39c3dffa9afd97eea816cc72df8ced619538b3 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_port.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_port.c
@@ -17,9 +17,6 @@
 #include "hinic_port.h"
 #include "hinic_dev.h"
 
-#define HINIC_MIN_MTU_SIZE              256
-#define HINIC_MAX_JUMBO_FRAME_SIZE      15872
-
 enum mac_op {
        MAC_DEL,
        MAC_SET,
@@ -147,24 +144,12 @@ int hinic_port_get_mac(struct hinic_dev *nic_dev, u8 *addr)
  **/
 int hinic_port_set_mtu(struct hinic_dev *nic_dev, int new_mtu)
 {
-       struct net_device *netdev = nic_dev->netdev;
        struct hinic_hwdev *hwdev = nic_dev->hwdev;
        struct hinic_port_mtu_cmd port_mtu_cmd;
        struct hinic_hwif *hwif = hwdev->hwif;
        u16 out_size = sizeof(port_mtu_cmd);
        struct pci_dev *pdev = hwif->pdev;
-       int err, max_frame;
-
-       if (new_mtu < HINIC_MIN_MTU_SIZE) {
-               netif_err(nic_dev, drv, netdev, "mtu < MIN MTU size");
-               return -EINVAL;
-       }
-
-       max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
-       if (max_frame > HINIC_MAX_JUMBO_FRAME_SIZE) {
-               netif_err(nic_dev, drv, netdev, "mtu > MAX MTU size");
-               return -EINVAL;
-       }
+       int err;
 
        port_mtu_cmd.func_idx = HINIC_HWIF_FUNC_IDX(hwif);
        port_mtu_cmd.mtu = new_mtu;