| Message ID | 1696020147-14989-3-git-send-email-haiyangz@microsoft.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7a54de92657455210d0ca71d4176b553952c871a |
| Headers | show |
| Series | net: mana: Fix some TX processing bugs | expand |
On Fri, Sep 29, 2023 at 01:42:26PM -0700, Haiyang Zhang wrote: > sizeof(struct hop_jumbo_hdr) is not part of tso_bytes, so remove > the subtraction from header size. > > Cc: stable@vger.kernel.org > Fixes: bd7fc6e1957c ("net: mana: Add new MANA VF performance counters for easier troubleshooting") > Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> > Reviewed-by: Simon Horman <horms@kernel.org> > --- > drivers/net/ethernet/microsoft/mana/mana_en.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c > index 5cdcf7561b38..86e724c3eb89 100644 > --- a/drivers/net/ethernet/microsoft/mana/mana_en.c > +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c > @@ -264,8 +264,6 @@ netdev_tx_t mana_start_xmit(struct sk_buff *skb, struct net_device *ndev) > ihs = skb_transport_offset(skb) + sizeof(struct udphdr); > } else { > ihs = skb_tcp_all_headers(skb); > - if (ipv6_has_hopopt_jumbo(skb)) > - ihs -= sizeof(struct hop_jumbo_hdr); > } > > u64_stats_update_begin(&tx_stats->syncp); > -- > 2.25.1 Reviewed-by:Shradha Gupta <shradhagupta@linux.microsoft.com>
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 5cdcf7561b38..86e724c3eb89 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -264,8 +264,6 @@ netdev_tx_t mana_start_xmit(struct sk_buff *skb, struct net_device *ndev) ihs = skb_transport_offset(skb) + sizeof(struct udphdr); } else { ihs = skb_tcp_all_headers(skb); - if (ipv6_has_hopopt_jumbo(skb)) - ihs -= sizeof(struct hop_jumbo_hdr); } u64_stats_update_begin(&tx_stats->syncp);
sizeof(struct hop_jumbo_hdr) is not part of tso_bytes, so remove the subtraction from header size. Cc: stable@vger.kernel.org Fixes: bd7fc6e1957c ("net: mana: Add new MANA VF performance counters for easier troubleshooting") Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Reviewed-by: Simon Horman <horms@kernel.org> --- drivers/net/ethernet/microsoft/mana/mana_en.c | 2 -- 1 file changed, 2 deletions(-)