From patchwork Wed Sep 24 18:23:22 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 1325 X-Patchwork-Delegate: jgarzik@pobox.com 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 3CACCDE13F for ; Thu, 25 Sep 2008 04:24:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752651AbYIXSYO (ORCPT ); Wed, 24 Sep 2008 14:24:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752286AbYIXSYO (ORCPT ); Wed, 24 Sep 2008 14:24:14 -0400 Received: from sj-iport-6.cisco.com ([171.71.176.117]:1240 "EHLO sj-iport-6.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752587AbYIXSYN (ORCPT ); Wed, 24 Sep 2008 14:24:13 -0400 X-IronPort-AV: E=Sophos;i="4.33,302,1220227200"; d="scan'208";a="161947352" Received: from sj-dkim-2.cisco.com ([171.71.179.186]) by sj-iport-6.cisco.com with ESMTP; 24 Sep 2008 18:24:12 +0000 Received: from sj-core-2.cisco.com (sj-core-2.cisco.com [171.71.177.254]) by sj-dkim-2.cisco.com (8.12.11/8.12.11) with ESMTP id m8OIOCvv002098; Wed, 24 Sep 2008 11:24:12 -0700 Received: from palito_client100.nuovasystems.com ([172.30.136.82]) by sj-core-2.cisco.com (8.13.8/8.13.8) with ESMTP id m8OIOCXD005259; Wed, 24 Sep 2008 18:24:12 GMT From: Scott Feldman Subject: [PATCH 1/4] enic: Don't indicate IPv6 pkts using soft-LRO To: jgarzik@pobox.com Cc: netdev@vger.kernel.org Date: Wed, 24 Sep 2008 11:23:22 -0700 Message-ID: <20080924182322.22778.63322.stgit@palito_client100.nuovasystems.com> In-Reply-To: <20080924182154.22778.76605.stgit@palito_client100.nuovasystems.com> References: <20080924182154.22778.76605.stgit@palito_client100.nuovasystems.com> User-Agent: StGIT/0.12.1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; l=1115; t=1222280652; x=1223144652; c=relaxed/simple; s=sjdkim2002; h=Content-Type:From:Subject:Content-Transfer-Encoding:MIME-Version; d=cisco.com; i=scofeldm@cisco.com; z=From:=20Scott=20Feldman=20 |Subject:=20[PATCH=201/4]=20enic=3A=20Don't=20indicate=20IP v6=20pkts=20using=20soft-LRO |Sender:=20; bh=vyFmZXXtEwvGsrpQ/9xNXFAEy4f2rPXa+BcmMs6Ktf8=; b=t6E6NF5wbbpHkWf94ZNsGNnuBm1e5XUJOEVdKhby87dP/hDaLvuzSQcdpF PEhHgBC6w3U5NSDEM0hbJxilYbMt5usDk+m75vb/45VaV4H5c/A3cM7/suFw 6qxuYshLFn; Authentication-Results: sj-dkim-2; header.From=scofeldm@cisco.com; dkim=pass ( sig from cisco.com/sjdkim2002 verified; ); Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org enic: Don't indicate IPv6 pkts using soft-LRO LRO is only applied to IPv4 pkts, so don't use the LRO indication functions for anything other IPv4 pkts. Every non-IPv4 pkt is indicated using non- LRO functions. Signed-off-by: Scott Feldman --- drivers/net/enic/enic_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 2592e52..6284594 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -942,7 +942,7 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq, if (enic->vlan_group && vlan_stripped) { - if (ENIC_SETTING(enic, LRO)) + if (ENIC_SETTING(enic, LRO) && ipv4) lro_vlan_hwaccel_receive_skb(&enic->lro_mgr, skb, enic->vlan_group, vlan, cq_desc); @@ -952,7 +952,7 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq, } else { - if (ENIC_SETTING(enic, LRO)) + if (ENIC_SETTING(enic, LRO) && ipv4) lro_receive_skb(&enic->lro_mgr, skb, cq_desc); else netif_receive_skb(skb);