From patchwork Mon Sep 19 18:49:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Borundia X-Patchwork-Id: 115383 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 50B3BB6F83 for ; Tue, 20 Sep 2011 05:00:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756645Ab1ISTAv (ORCPT ); Mon, 19 Sep 2011 15:00:51 -0400 Received: from tx2ehsobe003.messaging.microsoft.com ([65.55.88.13]:42525 "EHLO TX2EHSOBE005.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756451Ab1ISTAu (ORCPT ); Mon, 19 Sep 2011 15:00:50 -0400 Received: from mail136-tx2-R.bigfish.com (10.9.14.250) by TX2EHSOBE005.bigfish.com (10.9.40.25) with Microsoft SMTP Server id 14.1.225.22; Mon, 19 Sep 2011 19:00:50 +0000 Received: from mail136-tx2 (localhost.localdomain [127.0.0.1]) by mail136-tx2-R.bigfish.com (Postfix) with ESMTP id EAC5012301D0; Mon, 19 Sep 2011 19:00:49 +0000 (UTC) X-SpamScore: 0 X-BigFish: VPS0(zzzz1202hzz8275bhz2fh2a8h668h839h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: CIP:198.70.193.61; KIP:(null); UIP:(null); IPVD:NLI; H:avexcashub1.qlogic.com; RD:avexcashub1.qlogic.com; EFVD:NLI Received-SPF: pass (mail136-tx2: domain of qlogic.com designates 198.70.193.61 as permitted sender) client-ip=198.70.193.61; envelope-from=rajesh.borundia@qlogic.com; helo=avexcashub1.qlogic.com ; 1.qlogic.com ; Received: from mail136-tx2 (localhost.localdomain [127.0.0.1]) by mail136-tx2 (MessageSwitch) id 1316458849818843_10082; Mon, 19 Sep 2011 19:00:49 +0000 (UTC) Received: from TX2EHSMHS027.bigfish.com (unknown [10.9.14.247]) by mail136-tx2.bigfish.com (Postfix) with ESMTP id BC050930054; Mon, 19 Sep 2011 19:00:49 +0000 (UTC) Received: from avexcashub1.qlogic.com (198.70.193.61) by TX2EHSMHS027.bigfish.com (10.9.99.127) with Microsoft SMTP Server (TLS) id 14.1.225.22; Mon, 19 Sep 2011 19:00:43 +0000 Received: from mx.mv.qlogic.com (10.29.3.18) by avexcashub1.qlc.com (10.1.4.161) with Microsoft SMTP Server id 8.3.192.1; Mon, 19 Sep 2011 12:00:43 -0700 Received: from lnxdev-sm-001.mv.qlogic.com (dut6217.mv.qlogic.com [172.29.56.217]) by mx.mv.qlogic.com (Postfix) with ESMTP id D997EC3176; Mon, 19 Sep 2011 12:00:42 -0700 (PDT) Received: by lnxdev-sm-001.mv.qlogic.com (Postfix, from userid 0) id D631814A98E; Mon, 19 Sep 2011 11:49:52 -0700 (PDT) From: Rajesh Borundia To: David Miller CC: netdev , Ameen Rahman , Sony Chacko Subject: [PATCH net-next 1/2] netxen: Fix vhdr_len in case of non vlan packets. Date: Mon, 19 Sep 2011 11:49:51 -0700 Message-ID: <1316458192-8691-2-git-send-email-rajesh.borundia@qlogic.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1316458192-8691-1-git-send-email-rajesh.borundia@qlogic.com> References: <1316458192-8691-1-git-send-email-rajesh.borundia@qlogic.com> MIME-Version: 1.0 X-OriginatorOrg: qlogic.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org o Set vlan header length to zero. Signed-off-by: Rajesh Borundia --- .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c index d6c6357..a8259cc 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c @@ -1620,7 +1620,7 @@ netxen_process_lro(struct netxen_adapter *adapter, int index; u16 lro_length, length, data_offset; u32 seq_number; - u8 vhdr_len; + u8 vhdr_len = 0; if (unlikely(ring > adapter->max_rds_rings)) return NULL;