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/hns3: fix maximum queues on configuration failure
[dpdk.git]
/
drivers
/
net
/
octeontx2
/
otx2_vlan.c
diff --git
a/drivers/net/octeontx2/otx2_vlan.c
b/drivers/net/octeontx2/otx2_vlan.c
index
322a565
..
f5161e1
100644
(file)
--- a/
drivers/net/octeontx2/otx2_vlan.c
+++ b/
drivers/net/octeontx2/otx2_vlan.c
@@
-306,12
+306,12
@@
nix_vlan_mcam_config(struct rte_eth_dev *eth_dev,
(0xF & ~(NPC_LT_LB_CTAG ^ NPC_LT_LB_STAG_QINQ))
<< mkex->lb_lt_offset;
(0xF & ~(NPC_LT_LB_CTAG ^ NPC_LT_LB_STAG_QINQ))
<< mkex->lb_lt_offset;
- mcam_data = (
(uint32_t)vlan_id << 16)
;
- mcam_mask = (BIT_ULL(16) - 1)
<< 16
;
+ mcam_data = (
uint16_t)vlan_id
;
+ mcam_mask = (BIT_ULL(16) - 1);
otx2_mbox_memcpy(key_data + mkex->lb_xtract.key_off,
otx2_mbox_memcpy(key_data + mkex->lb_xtract.key_off,
- &mcam_data, mkex->lb_xtract.len
+ 1
);
+ &mcam_data, mkex->lb_xtract.len);
otx2_mbox_memcpy(key_mask + mkex->lb_xtract.key_off,
otx2_mbox_memcpy(key_mask + mkex->lb_xtract.key_off,
- &mcam_mask, mkex->lb_xtract.len
+ 1
);
+ &mcam_mask, mkex->lb_xtract.len);
}
/* Adds LB STAG flag to MCAM KW */
}
/* Adds LB STAG flag to MCAM KW */
@@
-717,11
+717,6
@@
otx2_nix_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask)
rxmode = ð_dev->data->dev_conf.rxmode;
rxmode = ð_dev->data->dev_conf.rxmode;
- if (mask & ETH_VLAN_EXTEND_MASK) {
- otx2_err("Extend offload not supported");
- return -ENOTSUP;
- }
-
if (mask & ETH_VLAN_STRIP_MASK) {
if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP) {
offloads |= DEV_RX_OFFLOAD_VLAN_STRIP;
if (mask & ETH_VLAN_STRIP_MASK) {
if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP) {
offloads |= DEV_RX_OFFLOAD_VLAN_STRIP;