diff options
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4/l2t.c')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/l2t.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c index a047baa9fd04..5ae14451c3a4 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/l2t.c +++ b/drivers/net/ethernet/chelsio/cxgb4/l2t.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include "t4_msg.h" | 46 | #include "t4_msg.h" |
47 | #include "t4fw_api.h" | 47 | #include "t4fw_api.h" |
48 | #include "t4_regs.h" | 48 | #include "t4_regs.h" |
49 | #include "t4_values.h" | ||
49 | 50 | ||
50 | #define VLAN_NONE 0xfff | 51 | #define VLAN_NONE 0xfff |
51 | 52 | ||
@@ -425,7 +426,7 @@ u64 cxgb4_select_ntuple(struct net_device *dev, | |||
425 | * in the Compressed Filter Tuple. | 426 | * in the Compressed Filter Tuple. |
426 | */ | 427 | */ |
427 | if (tp->vlan_shift >= 0 && l2t->vlan != VLAN_NONE) | 428 | if (tp->vlan_shift >= 0 && l2t->vlan != VLAN_NONE) |
428 | ntuple |= (u64)(F_FT_VLAN_VLD | l2t->vlan) << tp->vlan_shift; | 429 | ntuple |= (u64)(FT_VLAN_VLD_F | l2t->vlan) << tp->vlan_shift; |
429 | 430 | ||
430 | if (tp->port_shift >= 0) | 431 | if (tp->port_shift >= 0) |
431 | ntuple |= (u64)l2t->lport << tp->port_shift; | 432 | ntuple |= (u64)l2t->lport << tp->port_shift; |
@@ -439,9 +440,9 @@ u64 cxgb4_select_ntuple(struct net_device *dev, | |||
439 | u32 pf = FW_VIID_PFN_G(viid); | 440 | u32 pf = FW_VIID_PFN_G(viid); |
440 | u32 vld = FW_VIID_VIVLD_G(viid); | 441 | u32 vld = FW_VIID_VIVLD_G(viid); |
441 | 442 | ||
442 | ntuple |= (u64)(V_FT_VNID_ID_VF(vf) | | 443 | ntuple |= (u64)(FT_VNID_ID_VF_V(vf) | |
443 | V_FT_VNID_ID_PF(pf) | | 444 | FT_VNID_ID_PF_V(pf) | |
444 | V_FT_VNID_ID_VLD(vld)) << tp->vnic_shift; | 445 | FT_VNID_ID_VLD_V(vld)) << tp->vnic_shift; |
445 | } | 446 | } |
446 | 447 | ||
447 | return ntuple; | 448 | return ntuple; |