git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/sfc: add Rx datapath method to get pushed buffers count
[dpdk.git]
/
drivers
/
net
/
i40e
/
i40e_ethdev.h
diff --git
a/drivers/net/i40e/i40e_ethdev.h
b/drivers/net/i40e/i40e_ethdev.h
index
ba6acd1
..
cd6deab
100644
(file)
--- a/
drivers/net/i40e/i40e_ethdev.h
+++ b/
drivers/net/i40e/i40e_ethdev.h
@@
-90,8
+90,10
@@
do { \
uint32_t ori_val; \
struct rte_eth_dev *dev; \
do { \
uint32_t ori_val; \
struct rte_eth_dev *dev; \
+ struct rte_eth_dev_data *dev_data; \
ori_val = I40E_READ_REG((hw), (reg)); \
ori_val = I40E_READ_REG((hw), (reg)); \
- dev = ((struct i40e_adapter *)hw->back)->eth_dev; \
+ dev_data = ((struct i40e_adapter *)hw->back)->pf.dev_data; \
+ dev = &rte_eth_devices[dev_data->port_id]; \
I40E_PCI_REG_WRITE(I40E_PCI_REG_ADDR((hw), \
(reg)), (value)); \
if (ori_val != value) \
I40E_PCI_REG_WRITE(I40E_PCI_REG_ADDR((hw), \
(reg)), (value)); \
if (ori_val != value) \
@@
-788,7
+790,7
@@
struct i40e_fdir_info {
bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER];
bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX];
bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER];
bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX];
- bool inset_flag[I40E_FILTER_PCTYPE_MAX]; /* Mark if input set is set */
+ uint32_t flow_count[I40E_FILTER_PCTYPE_MAX];
uint32_t flex_flow_count[I40E_MAX_FLXPLD_LAYER];
};
uint32_t flex_flow_count[I40E_MAX_FLXPLD_LAYER];
};
@@
-1285,7
+1287,6
@@
struct i40e_vf {
struct i40e_adapter {
/* Common for both PF and VF */
struct i40e_hw hw;
struct i40e_adapter {
/* Common for both PF and VF */
struct i40e_hw hw;
- struct rte_eth_dev *eth_dev;
/* Specific for PF or VF */
union {
/* Specific for PF or VF */
union {
@@
-1540,7
+1541,7
@@
i40e_get_vsi_from_adapter(struct i40e_adapter *adapter)
#define I40E_VSI_TO_DEV_DATA(vsi) \
(((struct i40e_vsi *)vsi)->adapter->pf.dev_data)
#define I40E_VSI_TO_ETH_DEV(vsi) \
#define I40E_VSI_TO_DEV_DATA(vsi) \
(((struct i40e_vsi *)vsi)->adapter->pf.dev_data)
#define I40E_VSI_TO_ETH_DEV(vsi) \
- (
((struct i40e_vsi *)vsi)->adapter->eth_dev
)
+ (
&rte_eth_devices[((struct i40e_vsi *)vsi)->adapter->pf.dev_data->port_id]
)
/* I40E_PF_TO */
#define I40E_PF_TO_HW(pf) \
/* I40E_PF_TO */
#define I40E_PF_TO_HW(pf) \