| Message ID | 20250225212927.69271-1-daniel@iogearbox.net (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] netkit: Remove double invocation to clear ipvs property flag | expand |
On 2/25/25 23:29, Daniel Borkmann wrote: > With ipvs_reset() now done unconditionally in skb_scrub_packet() > we would then call the former twice netkit_prep_forward(). Thus > remove the now unnecessary explicit call. > > Fixes: de2c211868b9 ("ipvs: Always clear ipvs_property flag in skb_scrub_packet()") > Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> > Cc: Philo Lu <lulie@linux.alibaba.com> > Cc: Nikolay Aleksandrov <razor@blackwall.org> > Cc: Martin KaFai Lau <martin.lau@kernel.org> > --- > [ Sending to net since de2c211868b9 is in net ] > > drivers/net/netkit.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/net/netkit.c b/drivers/net/netkit.c > index 1e1b00756be7..20088f781376 100644 > --- a/drivers/net/netkit.c > +++ b/drivers/net/netkit.c > @@ -65,7 +65,6 @@ static void netkit_prep_forward(struct sk_buff *skb, > skb_reset_mac_header(skb); > if (!xnet) > return; > - ipvs_reset(skb); > skb_clear_tstamp(skb); > if (xnet_scrub) > netkit_xnet(skb); Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
diff --git a/drivers/net/netkit.c b/drivers/net/netkit.c index 1e1b00756be7..20088f781376 100644 --- a/drivers/net/netkit.c +++ b/drivers/net/netkit.c @@ -65,7 +65,6 @@ static void netkit_prep_forward(struct sk_buff *skb, skb_reset_mac_header(skb); if (!xnet) return; - ipvs_reset(skb); skb_clear_tstamp(skb); if (xnet_scrub) netkit_xnet(skb);
With ipvs_reset() now done unconditionally in skb_scrub_packet() we would then call the former twice netkit_prep_forward(). Thus remove the now unnecessary explicit call. Fixes: de2c211868b9 ("ipvs: Always clear ipvs_property flag in skb_scrub_packet()") Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Cc: Philo Lu <lulie@linux.alibaba.com> Cc: Nikolay Aleksandrov <razor@blackwall.org> Cc: Martin KaFai Lau <martin.lau@kernel.org> --- [ Sending to net since de2c211868b9 is in net ] drivers/net/netkit.c | 1 - 1 file changed, 1 deletion(-)