From patchwork Wed Jan 21 05:50:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harvey Harrison X-Patchwork-Id: 19590 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 1F220DDEE8 for ; Wed, 21 Jan 2009 16:51:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755144AbZAUFvK (ORCPT ); Wed, 21 Jan 2009 00:51:10 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753134AbZAUFvI (ORCPT ); Wed, 21 Jan 2009 00:51:08 -0500 Received: from wf-out-1314.google.com ([209.85.200.172]:24781 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753005AbZAUFu7 (ORCPT ); Wed, 21 Jan 2009 00:50:59 -0500 Received: by wf-out-1314.google.com with SMTP id 27so4192261wfd.4 for ; Tue, 20 Jan 2009 21:50:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=sY0Z/a6jYgYr/sRXGW+XXc3pujFCSzlLvNoa5yLPm7g=; b=lyOlUzCgCGwhapbQDQs5jwRkBVzoLMR4/lfSicSr7DdYoBN0aEGDcB4TlVSUk2PPqI V3mw82rNmVxuo6UbpVrIwqJi69dT8dFg0DjBqjyonCZXJeGzkGqA1aOqXaub80CP1a1E EEvpIpGUjJ/t/GWMbet9zQx5Aai8uzn3Ra37A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=PZ/hC+eHku4pod8vYMdHB9/Uz5s+tyGtY+52w5t4+5RYrTuvTb7Y9a2q3+1LoX+u1Y S6k46hhWZtAayAioODYJT7e6LVT/kAFmATGSkYrXo6ZS4TV42VwgZz0OmyBOHWztOPNW mmFtX+eEfIAKFss5WoBfncejyjKKMSk/F1QQQ= Received: by 10.142.128.15 with SMTP id a15mr826287wfd.260.1232517059476; Tue, 20 Jan 2009 21:50:59 -0800 (PST) Received: from ?192.168.1.101? (216-19-190-48.dyn.novuscom.net [216.19.190.48]) by mx.google.com with ESMTPS id 22sm8513795wfd.13.2009.01.20.21.50.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 20 Jan 2009 21:50:59 -0800 (PST) Subject: [PATCH 7/9] bnx2x: annotate more fields in struct eth_tx_bd_flags From: Harvey Harrison To: Eilon Greenstein Cc: linux-netdev Date: Tue, 20 Jan 2009 21:50:50 -0800 Message-Id: <1232517051.9701.25.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.24.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Harvey Harrison --- drivers/net/bnx2x_hsi.h | 6 +++--- drivers/net/bnx2x_main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h index ba066b7..33d6d5d 100644 --- a/drivers/net/bnx2x_hsi.h +++ b/drivers/net/bnx2x_hsi.h @@ -1910,9 +1910,9 @@ struct eth_tx_bd_flags { struct eth_tx_bd { __le32 addr_lo; __le32 addr_hi; - u16 nbd; - u16 nbytes; - u16 vlan; + __le16 nbd; + __le16 nbytes; + __le16 vlan; struct eth_tx_bd_flags bd_flags; u8 general_data; #define ETH_TX_BD_HDR_NBDS (0x3F<<0) diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index f37c8ff..3d0907b 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -9383,7 +9383,7 @@ static noinline u16 bnx2x_tx_split(struct bnx2x *bp, d_tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping)); d_tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping)); d_tx_bd->nbytes = cpu_to_le16(old_len - hlen); - d_tx_bd->vlan = 0; + d_tx_bd->vlan = cpu_to_le16(0); /* this marks the BD as one that has no individual mapping * the FW ignores this flag in a BD not marked start */