[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <1366223785.3205.30.camel@edumazet-glaptop>
Date: Wed, 17 Apr 2013 11:36:25 -0700
From: Eric Dumazet <eric.dumazet@...il.com>
To: Shahed Shaikh <shahed.shaikh@...gic.com>
Cc: davem@...emloft.net, netdev@...r.kernel.org,
Dept_NX_Linux_NIC_Driver@...gic.com,
Sritej Velaga <sritej.velaga@...gic.com>
Subject: Re: [PATCH net-next v2 5/7] qlcnic: fix TSO race condition
On Wed, 2013-04-17 at 13:05 -0400, Shahed Shaikh wrote:
> From: Sritej Velaga <sritej.velaga@...gic.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@...gic.com>
> Signed-off-by: Shahed Shaikh <shahed.shaikh@...gic.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@...gle.com>
But its a real bug fix, targeted for net tree I presume.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists