net/mlx5: fix default queue number in RSS flow rule

[dpdk.git] / drivers / net / e1000 / igb_ethdev.c

diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index a1a7233..10ee0f3 100644 (file)
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -1825,8 +1825,7 @@ eth_igb_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *rte_stats)
 
        /* Rx Errors */
        rte_stats->imissed = stats->mpc;
-       rte_stats->ierrors = stats->crcerrs +
-                            stats->rlec + stats->ruc + stats->roc +
+       rte_stats->ierrors = stats->crcerrs + stats->rlec +
                             stats->rxerrc + stats->algnerrc + stats->cexterr;
 
        /* Tx Errors */
@@ -2160,9 +2159,11 @@ eth_igb_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
                }
                break;
        }
+       if (ret < 0)
+               return -EINVAL;
 
        ret += 1; /* add the size of '\0' */
-       if (fw_size < (u32)ret)
+       if (fw_size < (size_t)ret)
                return ret;
        else
                return 0;
@@ -2687,8 +2688,7 @@ igb_vlan_hw_extend_disable(struct rte_eth_dev *dev)
        /* Update maximum packet length */
        if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME)
                E1000_WRITE_REG(hw, E1000_RLPML,
-                       dev->data->dev_conf.rxmode.max_rx_pkt_len +
-                                               VLAN_TAG_SIZE);
+                               dev->data->dev_conf.rxmode.max_rx_pkt_len);
 }
 
 static void
@@ -2707,7 +2707,7 @@ igb_vlan_hw_extend_enable(struct rte_eth_dev *dev)
        if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME)
                E1000_WRITE_REG(hw, E1000_RLPML,
                        dev->data->dev_conf.rxmode.max_rx_pkt_len +
-                                               2 * VLAN_TAG_SIZE);
+                                               VLAN_TAG_SIZE);
 }
 
 static int
@@ -5119,9 +5119,6 @@ eth_igb_get_module_eeprom(struct rte_eth_dev *dev,
        u16 first_word, last_word;
        int i = 0;
 
-       if (info->length == 0)
-               return -EINVAL;
-
        first_word = info->offset >> 1;
        last_word = (info->offset + info->length - 1) >> 1;