pci: inherit common driver in PCI driver

[dpdk.git] / drivers / net / i40e / i40e_fdir.c

diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 8aa41e5..a4efc6d 100644 (file)
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -94,7 +94,9 @@
                I40E_PRTQF_FLX_PIT_SOURCE_OFF_MASK) | \
        (((fsize) << I40E_PRTQF_FLX_PIT_FSIZE_SHIFT) & \
                        I40E_PRTQF_FLX_PIT_FSIZE_MASK) | \
-       ((((dst_offset) + I40E_FLX_OFFSET_IN_FIELD_VECTOR) << \
+       ((((dst_offset) == NONUSE_FLX_PIT_DEST_OFF ? \
+                       NONUSE_FLX_PIT_DEST_OFF : \
+                       ((dst_offset) + I40E_FLX_OFFSET_IN_FIELD_VECTOR)) << \
                        I40E_PRTQF_FLX_PIT_DEST_OFF_SHIFT) & \
                        I40E_PRTQF_FLX_PIT_DEST_OFF_MASK))
 
@@ -249,7 +251,7 @@ i40e_fdir_setup(struct i40e_pf *pf)
 
        /* reserve memory for the fdir programming packet */
        snprintf(z_name, sizeof(z_name), "%s_%s_%d",
-                       eth_dev->driver->pci_drv.name,
+                       eth_dev->driver->pci_drv.driver.name,
                        I40E_FDIR_MZ_NAME,
                        eth_dev->data->port_id);
        mz = i40e_memzone_reserve(z_name, I40E_FDIR_PKT_LEN, SOCKET_ID_ANY);
@@ -1141,7 +1143,8 @@ i40e_fdir_filter_programming(struct i40e_pf *pf,
        fdirdp->dtype_cmd_cntindex |=
                        rte_cpu_to_le_32(I40E_TXD_FLTR_QW1_CNT_ENA_MASK);
        fdirdp->dtype_cmd_cntindex |=
-                       rte_cpu_to_le_32((pf->fdir.match_counter_index <<
+                       rte_cpu_to_le_32(
+                       ((uint32_t)pf->fdir.match_counter_index <<
                        I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &
                        I40E_TXD_FLTR_QW1_CNTINDEX_MASK);