| Message ID | 8ecb4d62fea0ba72bc8a5525d097b36a6c6d0b32.1689600901.git.gnault@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ba80e20d7f3f87dab3f9f0c0ca66e4b1fcc7be9f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: Remove more RTO_ONLINK users. | expand |
On Mon, Jul 17, 2023 at 9:53 AM Guillaume Nault <gnault@redhat.com> wrote: > > There's no reason for setting the RTO_ONLINK flag in ->flowi4_tos as > RT_CONN_FLAGS() does. We can easily set ->flowi4_scope properly > instead. This makes the code more explicit and will allow to convert > ->flowi4_tos to dscp_t in the future. > > Signed-off-by: Guillaume Nault <gnault@redhat.com> > --- > net/sctp/protocol.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c > index 274d07bd774f..33c0895e101c 100644 > --- a/net/sctp/protocol.c > +++ b/net/sctp/protocol.c > @@ -435,7 +435,8 @@ static void sctp_v4_get_dst(struct sctp_transport *t, union sctp_addr *saddr, > fl4->fl4_dport = daddr->v4.sin_port; > fl4->flowi4_proto = IPPROTO_SCTP; > if (asoc) { > - fl4->flowi4_tos = RT_CONN_FLAGS_TOS(asoc->base.sk, tos); > + fl4->flowi4_tos = RT_TOS(tos); > + fl4->flowi4_scope = ip_sock_rt_scope(asoc->base.sk); > fl4->flowi4_oif = asoc->base.sk->sk_bound_dev_if; > fl4->fl4_sport = htons(asoc->base.bind_addr.port); > } > -- > 2.39.2 Reviewed-by: Xin Long <lucien.xin@gmail.com>
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 274d07bd774f..33c0895e101c 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -435,7 +435,8 @@ static void sctp_v4_get_dst(struct sctp_transport *t, union sctp_addr *saddr, fl4->fl4_dport = daddr->v4.sin_port; fl4->flowi4_proto = IPPROTO_SCTP; if (asoc) { - fl4->flowi4_tos = RT_CONN_FLAGS_TOS(asoc->base.sk, tos); + fl4->flowi4_tos = RT_TOS(tos); + fl4->flowi4_scope = ip_sock_rt_scope(asoc->base.sk); fl4->flowi4_oif = asoc->base.sk->sk_bound_dev_if; fl4->fl4_sport = htons(asoc->base.bind_addr.port); }
There's no reason for setting the RTO_ONLINK flag in ->flowi4_tos as RT_CONN_FLAGS() does. We can easily set ->flowi4_scope properly instead. This makes the code more explicit and will allow to convert ->flowi4_tos to dscp_t in the future. Signed-off-by: Guillaume Nault <gnault@redhat.com> --- net/sctp/protocol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)