diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-04-11 17:38:02 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-04-11 17:38:03 -0700 |
| commit | 2e36437f44b3b71f383c36491b86be4bdd7fd12a (patch) | |
| tree | 80fcb3bc257874c018a5bdf09437342e503de7fc /include | |
| parent | d072c88c28e1e2c886681bbb0f1748b8e6ff105f (diff) | |
| parent | 9f6982e9a3c26a9db226cefd91c21a3e325ca397 (diff) | |
Merge branch 'ipv4-convert-several-tos-fields-to-dscp_t'
Guillaume Nault says:
====================
ipv4: Convert several tos fields to dscp_t
Continue the work started with commit a410a0cf9885 ("ipv6: Define
dscp_t and stop taking ECN bits into account in fib6-rules") and
convert more structure fields and variables to dscp_t. This series
focuses on struct fib_rt_info, struct fib_entry_notifier_info and their
users (networking drivers).
The purpose of dscp_t is to ensure that ECN bits don't influence IP
route lookups. It does so by ensuring that dscp_t variables have the
ECN bits cleared.
Notes:
* This series is entirely about type annotation and isn't supposed
to have any user visible effect.
* The first two patches have to introduce a few dsfield <-> dscp
conversions in the affected drivers, but those are then removed when
converting the internal driver structures (patches 3-5). In the end,
drivers don't have to handle any conversion.
====================
Link: https://lore.kernel.org/r/cover.1649445279.git.gnault@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ip_fib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 6a82bcb8813b..a378eff827c7 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -212,7 +212,7 @@ struct fib_rt_info { u32 tb_id; __be32 dst; int dst_len; - u8 tos; + dscp_t dscp; u8 type; u8 offload:1, trap:1, @@ -225,7 +225,7 @@ struct fib_entry_notifier_info { u32 dst; int dst_len; struct fib_info *fi; - u8 tos; + dscp_t dscp; u8 type; u32 tb_id; }; |