Skip to content

Commit 9a251ca

Browse files
Sven AuhagenPaolo Abeni
authored andcommitted
net: mvpp2: classifier flow fix fragmentation flags
Add missing IP Fragmentation Flag. Fixes: f9358e1 ("net: mvpp2: split ingress traffic into multiple flows") Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> Reviewed-by: Marcin Wojtas <mw@semihalf.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent ebd3b82 commit 9a251ca

1 file changed

Lines changed: 18 additions & 12 deletions

File tree

drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,35 +62,38 @@ static const struct mvpp2_cls_flow cls_flows[MVPP2_N_PRS_FLOWS] = {
6262
MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_UNTAG,
6363
MVPP22_CLS_HEK_IP4_2T,
6464
MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4 |
65-
MVPP2_PRS_RI_L4_TCP,
65+
MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_TCP,
6666
MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
6767

6868
MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_UNTAG,
6969
MVPP22_CLS_HEK_IP4_2T,
7070
MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OPT |
71-
MVPP2_PRS_RI_L4_TCP,
71+
MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_TCP,
7272
MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
7373

7474
MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_UNTAG,
7575
MVPP22_CLS_HEK_IP4_2T,
7676
MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OTHER |
77-
MVPP2_PRS_RI_L4_TCP,
77+
MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_TCP,
7878
MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
7979

8080
/* TCP over IPv4 flows, fragmented, with vlan tag */
8181
MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_TAG,
8282
MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_TAGGED,
83-
MVPP2_PRS_RI_L3_IP4 | MVPP2_PRS_RI_L4_TCP,
83+
MVPP2_PRS_RI_L3_IP4 | MVPP2_PRS_RI_IP_FRAG_TRUE |
84+
MVPP2_PRS_RI_L4_TCP,
8485
MVPP2_PRS_IP_MASK),
8586

8687
MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_TAG,
8788
MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_TAGGED,
88-
MVPP2_PRS_RI_L3_IP4_OPT | MVPP2_PRS_RI_L4_TCP,
89+
MVPP2_PRS_RI_L3_IP4_OPT | MVPP2_PRS_RI_IP_FRAG_TRUE |
90+
MVPP2_PRS_RI_L4_TCP,
8991
MVPP2_PRS_IP_MASK),
9092

9193
MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_TAG,
9294
MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_TAGGED,
93-
MVPP2_PRS_RI_L3_IP4_OTHER | MVPP2_PRS_RI_L4_TCP,
95+
MVPP2_PRS_RI_L3_IP4_OTHER | MVPP2_PRS_RI_IP_FRAG_TRUE |
96+
MVPP2_PRS_RI_L4_TCP,
9497
MVPP2_PRS_IP_MASK),
9598

9699
/* UDP over IPv4 flows, Not fragmented, no vlan tag */
@@ -132,35 +135,38 @@ static const struct mvpp2_cls_flow cls_flows[MVPP2_N_PRS_FLOWS] = {
132135
MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_UNTAG,
133136
MVPP22_CLS_HEK_IP4_2T,
134137
MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4 |
135-
MVPP2_PRS_RI_L4_UDP,
138+
MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_UDP,
136139
MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
137140

138141
MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_UNTAG,
139142
MVPP22_CLS_HEK_IP4_2T,
140143
MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OPT |
141-
MVPP2_PRS_RI_L4_UDP,
144+
MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_UDP,
142145
MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
143146

144147
MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_UNTAG,
145148
MVPP22_CLS_HEK_IP4_2T,
146149
MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OTHER |
147-
MVPP2_PRS_RI_L4_UDP,
150+
MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_UDP,
148151
MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
149152

150153
/* UDP over IPv4 flows, fragmented, with vlan tag */
151154
MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_TAG,
152155
MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_TAGGED,
153-
MVPP2_PRS_RI_L3_IP4 | MVPP2_PRS_RI_L4_UDP,
156+
MVPP2_PRS_RI_L3_IP4 | MVPP2_PRS_RI_IP_FRAG_TRUE |
157+
MVPP2_PRS_RI_L4_UDP,
154158
MVPP2_PRS_IP_MASK),
155159

156160
MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_TAG,
157161
MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_TAGGED,
158-
MVPP2_PRS_RI_L3_IP4_OPT | MVPP2_PRS_RI_L4_UDP,
162+
MVPP2_PRS_RI_L3_IP4_OPT | MVPP2_PRS_RI_IP_FRAG_TRUE |
163+
MVPP2_PRS_RI_L4_UDP,
159164
MVPP2_PRS_IP_MASK),
160165

161166
MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_TAG,
162167
MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_TAGGED,
163-
MVPP2_PRS_RI_L3_IP4_OTHER | MVPP2_PRS_RI_L4_UDP,
168+
MVPP2_PRS_RI_L3_IP4_OTHER | MVPP2_PRS_RI_IP_FRAG_TRUE |
169+
MVPP2_PRS_RI_L4_UDP,
164170
MVPP2_PRS_IP_MASK),
165171

166172
/* TCP over IPv6 flows, not fragmented, no vlan tag */

0 commit comments

Comments
 (0)