net/ice: fix max frame size

[dpdk.git] / drivers / net / ixgbe / ixgbe_ethdev.c

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index b1be0c8..975fa47 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2702,6 +2702,10 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
                allowed_speeds = ETH_LINK_SPEED_100M | ETH_LINK_SPEED_1G |
                        ETH_LINK_SPEED_2_5G |  ETH_LINK_SPEED_5G |
                        ETH_LINK_SPEED_10G;
+               if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
+                               hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L)
+                       allowed_speeds = ETH_LINK_SPEED_10M |
+                               ETH_LINK_SPEED_100M | ETH_LINK_SPEED_1G;
                break;
        default:
                allowed_speeds = ETH_LINK_SPEED_100M | ETH_LINK_SPEED_1G |
@@ -2743,6 +2747,8 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
                        speed |= IXGBE_LINK_SPEED_1GB_FULL;
                if (*link_speeds & ETH_LINK_SPEED_100M)
                        speed |= IXGBE_LINK_SPEED_100_FULL;
+               if (*link_speeds & ETH_LINK_SPEED_10M)
+                       speed |= IXGBE_LINK_SPEED_10_FULL;
        }
 
        err = ixgbe_setup_link(hw, speed, link_up);
@@ -4061,8 +4067,12 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
        switch (link_speed) {
        default:
        case IXGBE_LINK_SPEED_UNKNOWN:
+               if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
+                       hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L)
+                       link.link_speed = ETH_SPEED_NUM_10M;
+               else
+                       link.link_speed = ETH_SPEED_NUM_100M;
                link.link_duplex = ETH_LINK_FULL_DUPLEX;
-               link.link_speed = ETH_SPEED_NUM_100M;
                break;
 
        case IXGBE_LINK_SPEED_100_FULL:
@@ -6343,20 +6353,22 @@ ixgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
 {
        struct ixgbe_hw *hw;
        uint32_t max_frame = mtu + IXGBE_ETH_OVERHEAD;
-       struct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode;
+       struct rte_eth_dev_data *dev_data = dev->data;
 
        hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        if ((mtu < ETHER_MIN_MTU) || (max_frame > ETHER_MAX_JUMBO_FRAME_LEN))
                return -EINVAL;
 
-       /* refuse mtu that requires the support of scattered packets when this
-        * feature has not been enabled before.
+       /* If device is started, refuse mtu that requires the support of
+        * scattered packets when this feature has not been enabled before.
         */
-       if (!(rx_conf->offloads & DEV_RX_OFFLOAD_SCATTER) &&
+       if (dev_data->dev_started && !dev_data->scattered_rx &&
            (max_frame + 2 * IXGBE_VLAN_TAG_SIZE >
-            dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM))
+            dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM)) {
+               PMD_INIT_LOG(ERR, "Stop port first.");
                return -EINVAL;
+       }
 
        /*
         * When supported by the underlying PF driver, use the IXGBE_VF_SET_MTU