| Message ID | 20240523165445.24016-1-iluceno@suse.de (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ipvs: Avoid unnecessary calls to skb_is_gso_sctp | expand |
Hello, On Thu, 23 May 2024, Ismael Luceno wrote: > In the context of the SCTP SNAT/DNAT handler, these calls can only > return true. > > Ref: e10d3ba4d434 ("ipvs: Fix checksumming on GSO of SCTP packets") checkpatch.pl prefers to see the "commit" word: Ref: commit e10d3ba4d434 ("ipvs: Fix checksumming on GSO of SCTP packets") > Signed-off-by: Ismael Luceno <iluceno@suse.de> Looks good to me for nf-next, thanks! Acked-by: Julian Anastasov <ja@ssi.bg> > CC: Pablo Neira Ayuso <pablo@netfilter.org> > CC: Michal Kubeček <mkubecek@suse.com> > CC: Simon Horman <horms@verge.net.au> > CC: Julian Anastasov <ja@ssi.bg> > CC: lvs-devel@vger.kernel.org > CC: netfilter-devel@vger.kernel.org > CC: netdev@vger.kernel.org > CC: coreteam@netfilter.org > --- > net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c > index 1e689c714127..83e452916403 100644 > --- a/net/netfilter/ipvs/ip_vs_proto_sctp.c > +++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c > @@ -126,7 +126,7 @@ sctp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, > if (sctph->source != cp->vport || payload_csum || > skb->ip_summed == CHECKSUM_PARTIAL) { > sctph->source = cp->vport; > - if (!skb_is_gso(skb) || !skb_is_gso_sctp(skb)) > + if (!skb_is_gso(skb)) > sctp_nat_csum(skb, sctph, sctphoff); > } else { > skb->ip_summed = CHECKSUM_UNNECESSARY; > @@ -175,7 +175,7 @@ sctp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, > (skb->ip_summed == CHECKSUM_PARTIAL && > !(skb_dst(skb)->dev->features & NETIF_F_SCTP_CRC))) { > sctph->dest = cp->dport; > - if (!skb_is_gso(skb) || !skb_is_gso_sctp(skb)) > + if (!skb_is_gso(skb)) > sctp_nat_csum(skb, sctph, sctphoff); > } else if (skb->ip_summed != CHECKSUM_PARTIAL) { > skb->ip_summed = CHECKSUM_UNNECESSARY; > -- > 2.44.0 Regards -- Julian Anastasov <ja@ssi.bg>
On Mon, May 27, 2024 at 08:59:37PM +0300, Julian Anastasov wrote: > > Hello, > > On Thu, 23 May 2024, Ismael Luceno wrote: > > > In the context of the SCTP SNAT/DNAT handler, these calls can only > > return true. > > > > Ref: e10d3ba4d434 ("ipvs: Fix checksumming on GSO of SCTP packets") > > checkpatch.pl prefers to see the "commit" word: > > Ref: commit e10d3ba4d434 ("ipvs: Fix checksumming on GSO of SCTP packets") > > > Signed-off-by: Ismael Luceno <iluceno@suse.de> > > Looks good to me for nf-next, thanks! > > Acked-by: Julian Anastasov <ja@ssi.bg> Likewise, looks good to me. Acked-by: Simon Horman <horms@kernel.org> ...
diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c index 1e689c714127..83e452916403 100644 --- a/net/netfilter/ipvs/ip_vs_proto_sctp.c +++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c @@ -126,7 +126,7 @@ sctp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, if (sctph->source != cp->vport || payload_csum || skb->ip_summed == CHECKSUM_PARTIAL) { sctph->source = cp->vport; - if (!skb_is_gso(skb) || !skb_is_gso_sctp(skb)) + if (!skb_is_gso(skb)) sctp_nat_csum(skb, sctph, sctphoff); } else { skb->ip_summed = CHECKSUM_UNNECESSARY; @@ -175,7 +175,7 @@ sctp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, (skb->ip_summed == CHECKSUM_PARTIAL && !(skb_dst(skb)->dev->features & NETIF_F_SCTP_CRC))) { sctph->dest = cp->dport; - if (!skb_is_gso(skb) || !skb_is_gso_sctp(skb)) + if (!skb_is_gso(skb)) sctp_nat_csum(skb, sctph, sctphoff); } else if (skb->ip_summed != CHECKSUM_PARTIAL) { skb->ip_summed = CHECKSUM_UNNECESSARY;
In the context of the SCTP SNAT/DNAT handler, these calls can only return true. Ref: e10d3ba4d434 ("ipvs: Fix checksumming on GSO of SCTP packets") Signed-off-by: Ismael Luceno <iluceno@suse.de> CC: Pablo Neira Ayuso <pablo@netfilter.org> CC: Michal Kubeček <mkubecek@suse.com> CC: Simon Horman <horms@verge.net.au> CC: Julian Anastasov <ja@ssi.bg> CC: lvs-devel@vger.kernel.org CC: netfilter-devel@vger.kernel.org CC: netdev@vger.kernel.org CC: coreteam@netfilter.org --- net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)