summaryrefslogtreecommitdiffstats
path: root/src/dpdk
diff options
context:
space:
mode:
authorIdo Barnea <ibarnea@cisco.com>2017-01-01 13:35:55 +0200
committerIdo Barnea <ibarnea@cisco.com>2017-01-01 13:35:55 +0200
commitfda9842014b327b1bc7cbeeea473a291568b9d1e (patch)
treeeea1fa11c743921e394789490495c1bd66293cf6 /src/dpdk
parent355c20f88d2013e7e8d22b27a49297dc92101aa2 (diff)
Fix --send-debug-pkt test so that VIC card will be able to work with less patches
Signed-off-by: Ido Barnea <ibarnea@cisco.com>
Diffstat (limited to 'src/dpdk')
-rw-r--r--src/dpdk/drivers/net/enic/base/vnic_dev.c6
-rw-r--r--src/dpdk/drivers/net/enic/enic_clsf.c11
2 files changed, 2 insertions, 15 deletions
diff --git a/src/dpdk/drivers/net/enic/base/vnic_dev.c b/src/dpdk/drivers/net/enic/base/vnic_dev.c
index e50b90e7..dddb1dcd 100644
--- a/src/dpdk/drivers/net/enic/base/vnic_dev.c
+++ b/src/dpdk/drivers/net/enic/base/vnic_dev.c
@@ -667,12 +667,8 @@ int vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
(promisc ? CMD_PFILTER_PROMISCUOUS : 0) |
(allmulti ? CMD_PFILTER_ALL_MULTICAST : 0);
-#define TREX_PATCH
-#ifdef TREX_PATCH
- err = vnic_dev_cmd(vdev, CMD_PACKET_FILTER_ALL, &a0, &a1, wait);
-#else
err = vnic_dev_cmd(vdev, CMD_PACKET_FILTER, &a0, &a1, wait);
-#endif
+
if (err)
pr_err("Can't set packet filter\n");
diff --git a/src/dpdk/drivers/net/enic/enic_clsf.c b/src/dpdk/drivers/net/enic/enic_clsf.c
index 8f68faab..1610951d 100644
--- a/src/dpdk/drivers/net/enic/enic_clsf.c
+++ b/src/dpdk/drivers/net/enic/enic_clsf.c
@@ -145,7 +145,7 @@ copy_fltr_recv_all(struct filter_v2 *fltr, struct rte_eth_fdir_input *input,
memset(&eth_mask, 0, sizeof(eth_mask));
memset(&eth_val, 0, sizeof(eth_val));
- eth_val.ether_type = 0x0806;
+ eth_val.ether_type = 0xdead;
eth_mask.ether_type = 0;
gp->position = 0;
@@ -381,14 +381,6 @@ int enic_fdir_del_fltr(struct enic *enic, struct rte_eth_fdir_filter *params)
/* The entry is present in the table */
key = enic->fdir.nodes[pos];
-#ifdef TREX_PATCH
- switch (params->soft_id) {
- case 100:
- // remove promisc when we delete 'receive all' filter
- vnic_dev_packet_filter(enic->vdev, 1, 1, 1, 0, 1);
- break;
- }
-#endif
/* Delete the filter */
vnic_dev_classifier(enic->vdev, CLSF_DEL,
&key->fltr_id, NULL);
@@ -498,7 +490,6 @@ int enic_fdir_add_fltr(struct enic *enic, struct rte_eth_fdir_filter *params)
#ifdef TREX_PATCH
switch (params->soft_id) {
case 100:
- vnic_dev_packet_filter(enic->vdev, 1, 1, 1, 1, 1);
copy_fltr_recv_all(&fltr, &params->input, &enic->rte_dev->data->dev_conf.fdir_conf.mask);
break;
default: