Skip to content

Commit 0da78e7

Browse files
Jiawen Wushemminger
authored andcommitted
net/txgbe: remove unsupported flow action mark
Flow action "mark" is not supported, just remove it. Fixes: b973ee2 ("net/txgbe: parse flow director filter") Cc: [email protected] Signed-off-by: Jiawen Wu <[email protected]>
1 parent 4b63d38 commit 0da78e7

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

drivers/net/txgbe/txgbe_flow.c

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,6 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
13581358
{
13591359
const struct rte_flow_action *act;
13601360
const struct rte_flow_action_queue *act_q;
1361-
const struct rte_flow_action_mark *mark;
13621361

13631362
/* parse attr */
13641363
/* must be input direction */
@@ -1423,10 +1422,9 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
14231422
rule->fdirflags = TXGBE_FDIRPICMD_DROP;
14241423
}
14251424

1426-
/* check if the next not void item is MARK */
1425+
/* nothing else supported */
14271426
act = next_no_void_action(actions, act);
1428-
if (act->type != RTE_FLOW_ACTION_TYPE_MARK &&
1429-
act->type != RTE_FLOW_ACTION_TYPE_END) {
1427+
if (act->type != RTE_FLOW_ACTION_TYPE_END) {
14301428
memset(rule, 0, sizeof(struct txgbe_fdir_rule));
14311429
rte_flow_error_set(error, EINVAL,
14321430
RTE_FLOW_ERROR_TYPE_ACTION,
@@ -1436,21 +1434,6 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
14361434

14371435
rule->soft_id = 0;
14381436

1439-
if (act->type == RTE_FLOW_ACTION_TYPE_MARK) {
1440-
mark = (const struct rte_flow_action_mark *)act->conf;
1441-
rule->soft_id = mark->id;
1442-
act = next_no_void_action(actions, act);
1443-
}
1444-
1445-
/* check if the next not void item is END */
1446-
if (act->type != RTE_FLOW_ACTION_TYPE_END) {
1447-
memset(rule, 0, sizeof(struct txgbe_fdir_rule));
1448-
rte_flow_error_set(error, EINVAL,
1449-
RTE_FLOW_ERROR_TYPE_ACTION,
1450-
act, "Not supported action.");
1451-
return -rte_errno;
1452-
}
1453-
14541437
return 0;
14551438
}
14561439

@@ -1562,8 +1545,6 @@ txgbe_fdir_parse_flow_type(struct txgbe_atr_input *input, u8 ptid, bool tun)
15621545
* The next not void item must be END.
15631546
* ACTION:
15641547
* The first not void action should be QUEUE or DROP.
1565-
* The second not void optional action should be MARK,
1566-
* mark_id is a uint32_t number.
15671548
* The next not void action should be END.
15681549
* UDP/TCP/SCTP pattern example:
15691550
* ITEM Spec Mask

0 commit comments

Comments
 (0)