diff options
-rw-r--r-- | drivers/net/ethernet/marvell/mvpp2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 23f96e9c392f..ed4abb3d7e23 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c | |||
@@ -510,28 +510,28 @@ enum mvpp2_tag_type { | |||
510 | /* Sram result info bits assignment */ | 510 | /* Sram result info bits assignment */ |
511 | #define MVPP2_PRS_RI_MAC_ME_MASK 0x1 | 511 | #define MVPP2_PRS_RI_MAC_ME_MASK 0x1 |
512 | #define MVPP2_PRS_RI_DSA_MASK 0x2 | 512 | #define MVPP2_PRS_RI_DSA_MASK 0x2 |
513 | #define MVPP2_PRS_RI_VLAN_MASK 0xc | 513 | #define MVPP2_PRS_RI_VLAN_MASK (BIT(2) | BIT(3)) |
514 | #define MVPP2_PRS_RI_VLAN_NONE ~(BIT(2) | BIT(3)) | 514 | #define MVPP2_PRS_RI_VLAN_NONE 0x0 |
515 | #define MVPP2_PRS_RI_VLAN_SINGLE BIT(2) | 515 | #define MVPP2_PRS_RI_VLAN_SINGLE BIT(2) |
516 | #define MVPP2_PRS_RI_VLAN_DOUBLE BIT(3) | 516 | #define MVPP2_PRS_RI_VLAN_DOUBLE BIT(3) |
517 | #define MVPP2_PRS_RI_VLAN_TRIPLE (BIT(2) | BIT(3)) | 517 | #define MVPP2_PRS_RI_VLAN_TRIPLE (BIT(2) | BIT(3)) |
518 | #define MVPP2_PRS_RI_CPU_CODE_MASK 0x70 | 518 | #define MVPP2_PRS_RI_CPU_CODE_MASK 0x70 |
519 | #define MVPP2_PRS_RI_CPU_CODE_RX_SPEC BIT(4) | 519 | #define MVPP2_PRS_RI_CPU_CODE_RX_SPEC BIT(4) |
520 | #define MVPP2_PRS_RI_L2_CAST_MASK 0x600 | 520 | #define MVPP2_PRS_RI_L2_CAST_MASK (BIT(9) | BIT(10)) |
521 | #define MVPP2_PRS_RI_L2_UCAST ~(BIT(9) | BIT(10)) | 521 | #define MVPP2_PRS_RI_L2_UCAST 0x0 |
522 | #define MVPP2_PRS_RI_L2_MCAST BIT(9) | 522 | #define MVPP2_PRS_RI_L2_MCAST BIT(9) |
523 | #define MVPP2_PRS_RI_L2_BCAST BIT(10) | 523 | #define MVPP2_PRS_RI_L2_BCAST BIT(10) |
524 | #define MVPP2_PRS_RI_PPPOE_MASK 0x800 | 524 | #define MVPP2_PRS_RI_PPPOE_MASK 0x800 |
525 | #define MVPP2_PRS_RI_L3_PROTO_MASK 0x7000 | 525 | #define MVPP2_PRS_RI_L3_PROTO_MASK (BIT(12) | BIT(13) | BIT(14)) |
526 | #define MVPP2_PRS_RI_L3_UN ~(BIT(12) | BIT(13) | BIT(14)) | 526 | #define MVPP2_PRS_RI_L3_UN 0x0 |
527 | #define MVPP2_PRS_RI_L3_IP4 BIT(12) | 527 | #define MVPP2_PRS_RI_L3_IP4 BIT(12) |
528 | #define MVPP2_PRS_RI_L3_IP4_OPT BIT(13) | 528 | #define MVPP2_PRS_RI_L3_IP4_OPT BIT(13) |
529 | #define MVPP2_PRS_RI_L3_IP4_OTHER (BIT(12) | BIT(13)) | 529 | #define MVPP2_PRS_RI_L3_IP4_OTHER (BIT(12) | BIT(13)) |
530 | #define MVPP2_PRS_RI_L3_IP6 BIT(14) | 530 | #define MVPP2_PRS_RI_L3_IP6 BIT(14) |
531 | #define MVPP2_PRS_RI_L3_IP6_EXT (BIT(12) | BIT(14)) | 531 | #define MVPP2_PRS_RI_L3_IP6_EXT (BIT(12) | BIT(14)) |
532 | #define MVPP2_PRS_RI_L3_ARP (BIT(13) | BIT(14)) | 532 | #define MVPP2_PRS_RI_L3_ARP (BIT(13) | BIT(14)) |
533 | #define MVPP2_PRS_RI_L3_ADDR_MASK 0x18000 | 533 | #define MVPP2_PRS_RI_L3_ADDR_MASK (BIT(15) | BIT(16)) |
534 | #define MVPP2_PRS_RI_L3_UCAST ~(BIT(15) | BIT(16)) | 534 | #define MVPP2_PRS_RI_L3_UCAST 0x0 |
535 | #define MVPP2_PRS_RI_L3_MCAST BIT(15) | 535 | #define MVPP2_PRS_RI_L3_MCAST BIT(15) |
536 | #define MVPP2_PRS_RI_L3_BCAST (BIT(15) | BIT(16)) | 536 | #define MVPP2_PRS_RI_L3_BCAST (BIT(15) | BIT(16)) |
537 | #define MVPP2_PRS_RI_IP_FRAG_MASK 0x20000 | 537 | #define MVPP2_PRS_RI_IP_FRAG_MASK 0x20000 |