New upstream version 18.11.2

[deb_dpdk.git] / drivers / net / i40e / i40e_ethdev_vf.c

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 100e71c..551f6fa 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1724,9 +1724,8 @@ i40evf_rxq_init(struct rte_eth_dev *dev, struct i40e_rx_queue *rxq)
        }
 
        if ((dev_data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) ||
-           (rxq->max_pkt_len + 2 * I40E_VLAN_TAG_SIZE) > buf_size) {
+           rxq->max_pkt_len > buf_size)
                dev_data->scattered_rx = 1;
-       }
 
        return 0;
 }
@@ -2262,11 +2261,11 @@ i40evf_dev_close(struct rte_eth_dev *dev)
         */
        i40evf_dev_promiscuous_disable(dev);
        i40evf_dev_allmulticast_disable(dev);
+       rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
 
        i40evf_reset_vf(dev);
        i40e_shutdown_adminq(hw);
        i40evf_disable_irq0(hw);
-       rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
        hw->adapter_closed = 1;
 }