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/ice/base: fix reference count on VSI list update
[dpdk.git]
/
drivers
/
net
/
enic
/
enic_ethdev.c
diff --git
a/drivers/net/enic/enic_ethdev.c
b/drivers/net/enic/enic_ethdev.c
index
746e045
..
32d5397
100644
(file)
--- a/
drivers/net/enic/enic_ethdev.c
+++ b/
drivers/net/enic/enic_ethdev.c
@@
-405,6
+405,10
@@
static int enicpmd_dev_configure(struct rte_eth_dev *eth_dev)
return ret;
}
return ret;
}
+ if (eth_dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG)
+ eth_dev->data->dev_conf.rxmode.offloads |=
+ DEV_RX_OFFLOAD_RSS_HASH;
+
enic->mc_count = 0;
enic->hw_ip_checksum = !!(eth_dev->data->dev_conf.rxmode.offloads &
DEV_RX_OFFLOAD_CHECKSUM);
enic->mc_count = 0;
enic->hw_ip_checksum = !!(eth_dev->data->dev_conf.rxmode.offloads &
DEV_RX_OFFLOAD_CHECKSUM);
@@
-507,6
+511,12
@@
static uint32_t speed_capa_from_pci_id(struct rte_eth_dev *eth_dev)
/* 1300 and later models are at least 40G */
if (id >= 0x0100)
return ETH_LINK_SPEED_40G;
/* 1300 and later models are at least 40G */
if (id >= 0x0100)
return ETH_LINK_SPEED_40G;
+ /* VFs have subsystem id 0, check device id */
+ if (id == 0) {
+ /* Newer VF implies at least 40G model */
+ if (pdev->id.device_id == PCI_DEVICE_ID_CISCO_VIC_ENET_SN)
+ return ETH_LINK_SPEED_40G;
+ }
return ETH_LINK_SPEED_10G;
}
return ETH_LINK_SPEED_10G;
}
@@
-930,7
+940,7
@@
static void enicpmd_dev_rxq_info_get(struct rte_eth_dev *dev,
ENICPMD_FUNC_TRACE();
sop_queue_idx = enic_rte_rq_idx_to_sop_idx(rx_queue_id);
ENICPMD_FUNC_TRACE();
sop_queue_idx = enic_rte_rq_idx_to_sop_idx(rx_queue_id);
- data_queue_idx = enic_rte_rq_idx_to_data_idx(rx_queue_id);
+ data_queue_idx = enic_rte_rq_idx_to_data_idx(rx_queue_id
, enic
);
rq_sop = &enic->rq[sop_queue_idx];
rq_data = &enic->rq[data_queue_idx]; /* valid if data_queue_enable */
qinfo->mp = rq_sop->mp;
rq_sop = &enic->rq[sop_queue_idx];
rq_data = &enic->rq[data_queue_idx]; /* valid if data_queue_enable */
qinfo->mp = rq_sop->mp;
@@
-1056,7
+1066,7
@@
static int enicpmd_dev_udp_tunnel_port_del(struct rte_eth_dev *eth_dev,
tnl->udp_port);
return -EINVAL;
}
tnl->udp_port);
return -EINVAL;
}
- return update_vxlan_port(enic,
ENIC_DEFAULT_VXLAN
_PORT);
+ return update_vxlan_port(enic,
RTE_VXLAN_DEFAULT
_PORT);
}
static int enicpmd_dev_fw_version_get(struct rte_eth_dev *eth_dev,
}
static int enicpmd_dev_fw_version_get(struct rte_eth_dev *eth_dev,