diff options
| author | Hariprasad Shenai | 2015-01-05 12:00:47 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-01-05 22:34:48 +0100 |
| commit | 0d8043389bf3abc86016995bfe3d3314dd5b3db7 (patch) | |
| tree | debb2518945bbe8c781fc9e9acc36a614a2f9bee /drivers/net/ethernet/chelsio/cxgb4/l2t.c | |
| parent | cxgb4/csiostor: Cleanup TP, MPS and TCAM related register defines (diff) | |
| download | kernel-qcow2-linux-0d8043389bf3abc86016995bfe3d3314dd5b3db7.tar.gz kernel-qcow2-linux-0d8043389bf3abc86016995bfe3d3314dd5b3db7.tar.xz kernel-qcow2-linux-0d8043389bf3abc86016995bfe3d3314dd5b3db7.zip | |
cxgb4/cxgb4vf/csiostor: Cleanup PL, XGMAC, SF and MC related register defines
This patch cleanups all PL, XGMAC and SF related macros/register defines
that are defined in t4_regs.h and the affected files
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 @@ #include "t4_msg.h" #include "t4fw_api.h" #include "t4_regs.h" +#include "t4_values.h" #define VLAN_NONE 0xfff @@ -425,7 +426,7 @@ u64 cxgb4_select_ntuple(struct net_device *dev, * in the Compressed Filter Tuple. */ if (tp->vlan_shift >= 0 && l2t->vlan != VLAN_NONE) - ntuple |= (u64)(F_FT_VLAN_VLD | l2t->vlan) << tp->vlan_shift; + ntuple |= (u64)(FT_VLAN_VLD_F | l2t->vlan) << tp->vlan_shift; if (tp->port_shift >= 0) ntuple |= (u64)l2t->lport << tp->port_shift; @@ -439,9 +440,9 @@ u64 cxgb4_select_ntuple(struct net_device *dev, u32 pf = FW_VIID_PFN_G(viid); u32 vld = FW_VIID_VIVLD_G(viid); - ntuple |= (u64)(V_FT_VNID_ID_VF(vf) | - V_FT_VNID_ID_PF(pf) | - V_FT_VNID_ID_VLD(vld)) << tp->vnic_shift; + ntuple |= (u64)(FT_VNID_ID_VF_V(vf) | + FT_VNID_ID_PF_V(pf) | + FT_VNID_ID_VLD_V(vld)) << tp->vnic_shift; } return ntuple; |