| Message ID | 20230616164549.2863037-1-ross.lagerwall@citrix.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7580e0a78eb29e7bb1a772eba4088250bbb70d41 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | be2net: Extend xmit workaround to BE3 chip | expand |
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 16 Jun 2023 17:45:49 +0100 you wrote: > We have seen a bug where the NIC incorrectly changes the length in the > IP header of a padded packet to include the padding bytes. The driver > already has a workaround for this so do the workaround for this NIC too. > This resolves the issue. > > The NIC in question identifies itself as follows: > > [...] Here is the summary with links: - be2net: Extend xmit workaround to BE3 chip https://git.kernel.org/netdev/net/c/7580e0a78eb2 You are awesome, thank you!
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 7e408bcc88de..0defd519ba62 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -1135,8 +1135,8 @@ static struct sk_buff *be_lancer_xmit_workarounds(struct be_adapter *adapter, eth_hdr_len = ntohs(skb->protocol) == ETH_P_8021Q ? VLAN_ETH_HLEN : ETH_HLEN; if (skb->len <= 60 && - (lancer_chip(adapter) || skb_vlan_tag_present(skb)) && - is_ipv4_pkt(skb)) { + (lancer_chip(adapter) || BE3_chip(adapter) || + skb_vlan_tag_present(skb)) && is_ipv4_pkt(skb)) { ip = (struct iphdr *)ip_hdr(skb); pskb_trim(skb, eth_hdr_len + ntohs(ip->tot_len)); }
We have seen a bug where the NIC incorrectly changes the length in the IP header of a padded packet to include the padding bytes. The driver already has a workaround for this so do the workaround for this NIC too. This resolves the issue. The NIC in question identifies itself as follows: [ 8.828494] be2net 0000:02:00.0: FW version is 10.7.110.31 [ 8.834759] be2net 0000:02:00.0: Emulex OneConnect(be3): PF FLEX10 port 1 02:00.0 Ethernet controller: Emulex Corporation OneConnect 10Gb NIC (be3) (rev 01) Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> --- drivers/net/ethernet/emulex/benet/be_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)