drivers/net: fix vfio kmod dependency

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

diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 4398719..1e07895 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -147,7 +147,7 @@ ixgbe_tx_free_bufs(struct ixgbe_tx_queue *txq)
 
        for (i = 0; i < txq->tx_rs_thresh; ++i, ++txep) {
                /* free buffers one at a time */
-               m = __rte_pktmbuf_prefree_seg(txep->mbuf);
+               m = rte_pktmbuf_prefree_seg(txep->mbuf);
                txep->mbuf = NULL;
 
                if (unlikely(m == NULL))
@@ -1585,8 +1585,6 @@ ixgbe_rx_alloc_bufs(struct ixgbe_rx_queue *rxq, bool reset_mbuf)
                /* populate the static rte mbuf fields */
                mb = rxep[i].mbuf;
                if (reset_mbuf) {
-                       mb->next = NULL;
-                       mb->nb_segs = 1;
                        mb->port = rxq->port_id;
                }
 
@@ -2194,12 +2192,6 @@ next_desc:
                        goto next_desc;
                }
 
-               /*
-                * This is the last buffer of the received packet - return
-                * the current cluster to the user.
-                */
-               rxm->next = NULL;
-
                /* Initialize the first mbuf of the returned packet */
                ixgbe_fill_cluster_head_buf(first_seg, &rxd, rxq, staterr);
 
@@ -3762,6 +3754,8 @@ ixgbe_dcb_hw_configure(struct rte_eth_dev *dev,
        uint32_t max_frame = dev->data->mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
        struct ixgbe_hw *hw =
                        IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct ixgbe_bw_conf *bw_conf =
+               IXGBE_DEV_PRIVATE_TO_BW_CONF(dev->data->dev_private);
 
        switch (dev->data->dev_conf.rxmode.mq_mode) {
        case ETH_MQ_RX_VMDQ_DCB:
@@ -3833,8 +3827,9 @@ ixgbe_dcb_hw_configure(struct rte_eth_dev *dev,
                /* Re-configure 4 TCs BW */
                for (i = 0; i < nb_tcs; i++) {
                        tc = &dcb_config->tc_config[i];
-                       tc->path[IXGBE_DCB_TX_CONFIG].bwg_percent =
-                                               (uint8_t)(100 / nb_tcs);
+                       if (bw_conf->tc_num != nb_tcs)
+                               tc->path[IXGBE_DCB_TX_CONFIG].bwg_percent =
+                                       (uint8_t)(100 / nb_tcs);
                        tc->path[IXGBE_DCB_RX_CONFIG].bwg_percent =
                                                (uint8_t)(100 / nb_tcs);
                }
@@ -3847,8 +3842,9 @@ ixgbe_dcb_hw_configure(struct rte_eth_dev *dev,
                /* Re-configure 8 TCs BW */
                for (i = 0; i < nb_tcs; i++) {
                        tc = &dcb_config->tc_config[i];
-                       tc->path[IXGBE_DCB_TX_CONFIG].bwg_percent =
-                               (uint8_t)(100 / nb_tcs + (i & 1));
+                       if (bw_conf->tc_num != nb_tcs)
+                               tc->path[IXGBE_DCB_TX_CONFIG].bwg_percent =
+                                       (uint8_t)(100 / nb_tcs + (i & 1));
                        tc->path[IXGBE_DCB_RX_CONFIG].bwg_percent =
                                (uint8_t)(100 / nb_tcs + (i & 1));
                }
@@ -4526,6 +4522,7 @@ ixgbe_set_rsc(struct rte_eth_dev *dev)
        bool rsc_capable = false;
        uint16_t i;
        uint32_t rdrxctl;
+       uint32_t rfctl;
 
        /* Sanity check */
        dev->dev_ops->dev_infos_get(dev, &dev_info);
@@ -4553,22 +4550,18 @@ ixgbe_set_rsc(struct rte_eth_dev *dev)
        }
 
        /* RFCTL configuration  */
-       if (rsc_capable) {
-               uint32_t rfctl = IXGBE_READ_REG(hw, IXGBE_RFCTL);
-
-               if (rx_conf->enable_lro)
-                       /*
-                        * Since NFS packets coalescing is not supported - clear
-                        * RFCTL.NFSW_DIS and RFCTL.NFSR_DIS when RSC is
-                        * enabled.
-                        */
-                       rfctl &= ~(IXGBE_RFCTL_RSC_DIS | IXGBE_RFCTL_NFSW_DIS |
-                                  IXGBE_RFCTL_NFSR_DIS);
-               else
-                       rfctl |= IXGBE_RFCTL_RSC_DIS;
-
-               IXGBE_WRITE_REG(hw, IXGBE_RFCTL, rfctl);
-       }
+       rfctl = IXGBE_READ_REG(hw, IXGBE_RFCTL);
+       if ((rsc_capable) && (rx_conf->enable_lro))
+               /*
+                * Since NFS packets coalescing is not supported - clear
+                * RFCTL.NFSW_DIS and RFCTL.NFSR_DIS when RSC is
+                * enabled.
+                */
+               rfctl &= ~(IXGBE_RFCTL_RSC_DIS | IXGBE_RFCTL_NFSW_DIS |
+                          IXGBE_RFCTL_NFSR_DIS);
+       else
+               rfctl |= IXGBE_RFCTL_RSC_DIS;
+       IXGBE_WRITE_REG(hw, IXGBE_RFCTL, rfctl);
 
        /* If LRO hasn't been requested - we are done here. */
        if (!rx_conf->enable_lro)