From patchwork Sat Nov 22 00:34:08 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 10171 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 467B2DDE0F for ; Sat, 22 Nov 2008 11:41:52 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754764AbYKVAls (ORCPT ); Fri, 21 Nov 2008 19:41:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754727AbYKVAlq (ORCPT ); Fri, 21 Nov 2008 19:41:46 -0500 Received: from sj-iport-1.cisco.com ([171.71.176.70]:21567 "EHLO sj-iport-1.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754719AbYKVAlq (ORCPT ); Fri, 21 Nov 2008 19:41:46 -0500 X-IronPort-AV: E=Sophos;i="4.33,647,1220227200"; d="scan'208";a="108455463" Received: from sj-dkim-3.cisco.com ([171.71.179.195]) by sj-iport-1.cisco.com with ESMTP; 22 Nov 2008 00:41:41 +0000 Received: from sj-core-2.cisco.com (sj-core-2.cisco.com [171.71.177.254]) by sj-dkim-3.cisco.com (8.12.11/8.12.11) with ESMTP id mAM0feiH023916; Fri, 21 Nov 2008 16:41:40 -0800 Received: from palito_client100.nuovasystems.com (savbu-palito-client100.cisco.com [10.193.70.13]) by sj-core-2.cisco.com (8.13.8/8.13.8) with ESMTP id mAM0feXS016500; Sat, 22 Nov 2008 00:41:40 GMT From: Scott Feldman Subject: [PATCH 3/5] enic: mask off some reserved bits in CQ descriptor for future use To: jgarzik@pobox.com Cc: netdev@vger.kernel.org Date: Fri, 21 Nov 2008 16:34:08 -0800 Message-ID: <20081122003408.15540.33764.stgit@palito_client100.nuovasystems.com> In-Reply-To: <20081122003219.15540.26759.stgit@palito_client100.nuovasystems.com> References: <20081122003219.15540.26759.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=1196; t=1227314500; x=1228178500; c=relaxed/simple; s=sjdkim3002; 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=203/5]=20enic=3A=20mask=20off=20some=20r eserved=20bits=20in=20CQ=20descriptor=20for=0A=09future=20us e |Sender:=20; bh=UfO818TPRQOtdwj1PR6ufiLYxRahjDNyySiNWNvkeHw=; b=s1RebunzOpn/UDwwPcba4cbAqoGeHA0+fleHMMPkj7IleviaOc6wW0nosY EOZ3Vcdk+dlR2xRi33yRZuzytFjT/onSs+BhF9szDGexCbh+0xhy4beTSFQm VRGzMEJySj; Authentication-Results: sj-dkim-3; header.From=scofeldm@cisco.com; dkim=pass ( sig from cisco.com/sjdkim3002 verified; ); Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org enic: mask off some reserved bits in CQ descriptor for future use Signed-off-by: Scott Feldman --- drivers/net/enic/cq_desc.h | 5 +++-- 1 files changed, 3 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/cq_desc.h b/drivers/net/enic/cq_desc.h index c036a8b..1eb289f 100644 --- a/drivers/net/enic/cq_desc.h +++ b/drivers/net/enic/cq_desc.h @@ -44,9 +44,10 @@ struct cq_desc { u8 type_color; }; -#define CQ_DESC_TYPE_BITS 7 +#define CQ_DESC_TYPE_BITS 4 #define CQ_DESC_TYPE_MASK ((1 << CQ_DESC_TYPE_BITS) - 1) #define CQ_DESC_COLOR_MASK 1 +#define CQ_DESC_COLOR_SHIFT 7 #define CQ_DESC_Q_NUM_BITS 10 #define CQ_DESC_Q_NUM_MASK ((1 << CQ_DESC_Q_NUM_BITS) - 1) #define CQ_DESC_COMP_NDX_BITS 12 @@ -58,7 +59,7 @@ static inline void cq_desc_dec(const struct cq_desc *desc_arg, const struct cq_desc *desc = desc_arg; const u8 type_color = desc->type_color; - *color = (type_color >> CQ_DESC_TYPE_BITS) & CQ_DESC_COLOR_MASK; + *color = (type_color >> CQ_DESC_COLOR_SHIFT) & CQ_DESC_COLOR_MASK; /* * Make sure color bit is read from desc *before* other fields