From patchwork Thu Oct 9 17:16:06 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 3619 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id AEC9ADE15A for ; Fri, 10 Oct 2008 04:10:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754244AbYJIRKt (ORCPT ); Thu, 9 Oct 2008 13:10:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754733AbYJIRKs (ORCPT ); Thu, 9 Oct 2008 13:10:48 -0400 Received: from mms3.broadcom.com ([216.31.210.19]:2468 "EHLO MMS3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753835AbYJIRKq (ORCPT ); Thu, 9 Oct 2008 13:10:46 -0400 Received: from [10.11.16.99] by MMS3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Thu, 09 Oct 2008 10:10:38 -0700 X-Server-Uuid: B55A25B1-5D7D-41F8-BC53-C57E7AD3C201 Received: by mail-irva-10.broadcom.com (Postfix, from userid 47) id 7B1882B0; Thu, 9 Oct 2008 10:10:38 -0700 (PDT) Received: from mail-irva-8.broadcom.com (mail-irva-8 [10.11.18.52]) by mail-irva-10.broadcom.com (Postfix) with ESMTP id 57FB72B1; Thu, 9 Oct 2008 10:10:38 -0700 (PDT) Received: from mail-irva-13.broadcom.com (mail-irva-13.broadcom.com [10.11.16.103]) by mail-irva-8.broadcom.com (MOS 3.7.5a-GA) with ESMTP id HFB20780; Thu, 9 Oct 2008 10:10:36 -0700 (PDT) Received: from dell (dhcp-10-12-136-135.broadcom.com [10.12.136.135]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 4F7B974CFF; Thu, 9 Oct 2008 10:10:36 -0700 (PDT) From: "Michael Chan" To: davem@davemloft.net cc: netdev@vger.kernel.org, "Michael Chan" Subject: [PATCH net-next 4/6] bnx2: Eliminate TSO header modifications. Date: Thu, 9 Oct 2008 10:16:06 -0700 Message-ID: <1223572568-1298-4-git-send-email-mchan@broadcom.com> X-Mailer: git-send-email 1.5.5.GIT In-Reply-To: <1223572568-1298-1-git-send-email-mchan@broadcom.com> References: <1223572568-1298-1-git-send-email-mchan@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 64F0E4843845300314-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is now possible with updated firmware. Signed-off-by: Michael Chan --- drivers/net/bnx2.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 21711c7..f147204 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -6008,7 +6008,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) } #endif if ((mss = skb_shinfo(skb)->gso_size)) { - u32 tcp_opt_len, ip_tcp_len; + u32 tcp_opt_len; struct iphdr *iph; vlan_tag_flags |= TX_BD_FLAGS_SW_LSO; @@ -6032,21 +6032,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) mss |= (tcp_off & 0xc) << TX_BD_TCP6_OFF2_SHL; } } else { - if (skb_header_cloned(skb) && - pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) { - dev_kfree_skb(skb); - return NETDEV_TX_OK; - } - - ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr); - iph = ip_hdr(skb); - iph->check = 0; - iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len); - tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr, - iph->daddr, 0, - IPPROTO_TCP, - 0); if (tcp_opt_len || (iph->ihl > 5)) { vlan_tag_flags |= ((iph->ihl - 5) + (tcp_opt_len >> 2)) << 8;