Skip to content

Commit 988f872

Browse files
Asbjørn Sloth Tønnesenkuba-moo
authored andcommitted
net/sched: cls_flower: add tunnel flags to fl_{set,dump}_key_flags()
Prepare to set and dump the tunnel flags. This code won't see any of these flags yet, as these flags aren't allowed by the NLA_POLICY_MASK, and the functions doesn't get called with encap set to true yet. Signed-off-by: Asbjørn Sloth Tønnesen <[email protected]> Tested-by: Davide Caratti <[email protected]> Reviewed-by: Davide Caratti <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 03afeb6 commit 988f872

File tree

1 file changed

+30
-0
lines changed

1 file changed

+30
-0
lines changed

net/sched/cls_flower.c

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,6 +1204,21 @@ static int fl_set_key_flags(struct nlattr **tb, bool encap, u32 *flags_key,
12041204
TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST,
12051205
FLOW_DIS_FIRST_FRAG);
12061206

1207+
fl_set_key_flag(key, mask, flags_key, flags_mask,
1208+
TCA_FLOWER_KEY_FLAGS_TUNNEL_CSUM,
1209+
FLOW_DIS_F_TUNNEL_CSUM);
1210+
1211+
fl_set_key_flag(key, mask, flags_key, flags_mask,
1212+
TCA_FLOWER_KEY_FLAGS_TUNNEL_DONT_FRAGMENT,
1213+
FLOW_DIS_F_TUNNEL_DONT_FRAGMENT);
1214+
1215+
fl_set_key_flag(key, mask, flags_key, flags_mask,
1216+
TCA_FLOWER_KEY_FLAGS_TUNNEL_OAM, FLOW_DIS_F_TUNNEL_OAM);
1217+
1218+
fl_set_key_flag(key, mask, flags_key, flags_mask,
1219+
TCA_FLOWER_KEY_FLAGS_TUNNEL_CRIT_OPT,
1220+
FLOW_DIS_F_TUNNEL_CRIT_OPT);
1221+
12071222
return 0;
12081223
}
12091224

@@ -3127,6 +3142,21 @@ static int fl_dump_key_flags(struct sk_buff *skb, bool encap,
31273142
TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST,
31283143
FLOW_DIS_FIRST_FRAG);
31293144

3145+
fl_get_key_flag(flags_key, flags_mask, &key, &mask,
3146+
TCA_FLOWER_KEY_FLAGS_TUNNEL_CSUM,
3147+
FLOW_DIS_F_TUNNEL_CSUM);
3148+
3149+
fl_get_key_flag(flags_key, flags_mask, &key, &mask,
3150+
TCA_FLOWER_KEY_FLAGS_TUNNEL_DONT_FRAGMENT,
3151+
FLOW_DIS_F_TUNNEL_DONT_FRAGMENT);
3152+
3153+
fl_get_key_flag(flags_key, flags_mask, &key, &mask,
3154+
TCA_FLOWER_KEY_FLAGS_TUNNEL_OAM, FLOW_DIS_F_TUNNEL_OAM);
3155+
3156+
fl_get_key_flag(flags_key, flags_mask, &key, &mask,
3157+
TCA_FLOWER_KEY_FLAGS_TUNNEL_CRIT_OPT,
3158+
FLOW_DIS_F_TUNNEL_CRIT_OPT);
3159+
31303160
_key = cpu_to_be32(key);
31313161
_mask = cpu_to_be32(mask);
31323162

0 commit comments

Comments
 (0)