From: Eric Dumazet <eric.dumazet@gmail.com>
To: Shahed Shaikh <shahed.shaikh@qlogic.com>
Cc: davem@davemloft.net, netdev@vger.kernel.org,
Dept_NX_Linux_NIC_Driver@qlogic.com,
Sritej Velaga <sritej.velaga@qlogic.com>
Subject: Re: [PATCH net-next v2 5/7] qlcnic: fix TSO race condition
Date: Wed, 17 Apr 2013 11:36:25 -0700 [thread overview]
Message-ID: <1366223785.3205.30.camel@edumazet-glaptop> (raw)
In-Reply-To: <1366218359-17701-6-git-send-email-shahed.shaikh@qlogic.com>
On Wed, 2013-04-17 at 13:05 -0400, Shahed Shaikh wrote:
> From: Sritej Velaga <sritej.velaga@qlogic.com>
>
> When driver receives a packet with gso size > 0 and when TSO is disabled,
> it should be transmitted as a TSO packet to prevent Tx timeout and subsequent
> firmware reset.
>
> Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com>
> Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
> ---
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
> index a85ca63..910346d 100644
> --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
> +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
> @@ -362,8 +362,7 @@ set_flags:
> memcpy(&first_desc->eth_addr, skb->data, ETH_ALEN);
> }
> opcode = TX_ETHER_PKT;
> - if ((adapter->netdev->features & (NETIF_F_TSO | NETIF_F_TSO6)) &&
> - skb_shinfo(skb)->gso_size > 0) {
> + if (skb_is_gso(skb)) {
> hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
> first_desc->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
> first_desc->total_hdr_length = hdr_len;
Acked-by: Eric Dumazet <edumazet@google.com>
But its a real bug fix, targeted for net tree I presume.
next prev parent reply other threads:[~2013-04-17 18:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-17 17:05 [PATCH net-next v2 0/7] Bug fixes and enhancements Shahed Shaikh
2013-04-17 17:05 ` [PATCH net-next v2 1/7] qlcnic: Fix typo in logs Shahed Shaikh
2013-04-17 17:05 ` [PATCH net-next v2 2/7] qlcnic: Enable Interrupt Coalescing for 83xx adapter Shahed Shaikh
2013-04-17 17:05 ` [PATCH net-next v2 3/7] qlcnic: Enhanced channel configuration logs Shahed Shaikh
2013-04-17 17:48 ` Sergei Shtylyov
2013-04-17 17:05 ` [PATCH net-next v2 4/7] qlcnic: Stop traffic before performing loopback test Shahed Shaikh
2013-04-17 17:05 ` [PATCH net-next v2 5/7] qlcnic: fix TSO race condition Shahed Shaikh
2013-04-17 18:36 ` Eric Dumazet [this message]
2013-04-17 17:05 ` [PATCH net-next v2 6/7] qlcnic: Fix endian data type Shahed Shaikh
2013-04-17 17:05 ` [PATCH net-next v2 7/7] qlcnic: Update version to 5.2.41 Shahed Shaikh
2013-04-17 17:32 ` [PATCH net-next v2 0/7] Bug fixes and enhancements David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366223785.3205.30.camel@edumazet-glaptop \
--to=eric.dumazet@gmail.com \
--cc=Dept_NX_Linux_NIC_Driver@qlogic.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=shahed.shaikh@qlogic.com \
--cc=sritej.velaga@qlogic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox