Commit 20bbf32e authored by Guillaume Nault's avatar Guillaume Nault Committed by Jakub Kicinski

netdevsim: Use dscp_t in struct nsim_fib4_rt

Use the new dscp_t type to replace the tos field of struct
nsim_fib4_rt. This ensures ECN bits are ignored and makes it compatible
with the dscp fields of struct fib_entry_notifier_info and struct
fib_rt_info.

This also allows sparse to flag potential incorrect uses of DSCP and
ECN bits.
Signed-off-by: default avatarGuillaume Nault <gnault@redhat.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 568a3f33
...@@ -79,7 +79,7 @@ struct nsim_fib_rt { ...@@ -79,7 +79,7 @@ struct nsim_fib_rt {
struct nsim_fib4_rt { struct nsim_fib4_rt {
struct nsim_fib_rt common; struct nsim_fib_rt common;
struct fib_info *fi; struct fib_info *fi;
u8 tos; dscp_t dscp;
u8 type; u8 type;
}; };
...@@ -284,7 +284,7 @@ nsim_fib4_rt_create(struct nsim_fib_data *data, ...@@ -284,7 +284,7 @@ nsim_fib4_rt_create(struct nsim_fib_data *data,
fib4_rt->fi = fen_info->fi; fib4_rt->fi = fen_info->fi;
fib_info_hold(fib4_rt->fi); fib_info_hold(fib4_rt->fi);
fib4_rt->tos = inet_dscp_to_dsfield(fen_info->dscp); fib4_rt->dscp = fen_info->dscp;
fib4_rt->type = fen_info->type; fib4_rt->type = fen_info->type;
return fib4_rt; return fib4_rt;
...@@ -343,7 +343,7 @@ static void nsim_fib4_rt_hw_flags_set(struct net *net, ...@@ -343,7 +343,7 @@ static void nsim_fib4_rt_hw_flags_set(struct net *net,
fri.tb_id = fib4_rt->common.key.tb_id; fri.tb_id = fib4_rt->common.key.tb_id;
fri.dst = cpu_to_be32(*p_dst); fri.dst = cpu_to_be32(*p_dst);
fri.dst_len = dst_len; fri.dst_len = dst_len;
fri.dscp = inet_dsfield_to_dscp(fib4_rt->tos); fri.dscp = fib4_rt->dscp;
fri.type = fib4_rt->type; fri.type = fib4_rt->type;
fri.offload = false; fri.offload = false;
fri.trap = trap; fri.trap = trap;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment