From patchwork Tue Sep 20 06:50:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 672112 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 3sdYLT2yBKz9sxS for ; Tue, 20 Sep 2016 16:50:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=broadcom.com header.i=@broadcom.com header.b=BGGMUR7t; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752927AbcITGun (ORCPT ); Tue, 20 Sep 2016 02:50:43 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:36377 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752504AbcITGui (ORCPT ); Tue, 20 Sep 2016 02:50:38 -0400 Received: by mail-pf0-f181.google.com with SMTP id q2so4060882pfj.3 for ; Mon, 19 Sep 2016 23:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/VaXP7WKnhDHwGpM0oWIGtKMgsZiQrux6sBCOMoF8OQ=; b=BGGMUR7tWfi7BtTN5iCML4rp5SWVnYu2Vu/d3zSr7ENpkiwEtpq6KA3zGu+fcIxRdw 4HSB6nmGhj9qepJd3qSV/IpGgZgQIHqAbkGZnTKGml1sOLyRhspx1G9AFMNhjO8fwiw6 YSmxpLZFWAGu+gSnO08zjncZH/+nK2dwbn1WM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/VaXP7WKnhDHwGpM0oWIGtKMgsZiQrux6sBCOMoF8OQ=; b=O1llogtqPf/H8zMzGn/R7L9WPZV064mBWoVi07eHViTKJpIui42SY7A91xTGvGwKnG OtgB+fZ5sWz//mWEw+/t15/KrYAEIt+rr5WwqA4T5Ydsj7Iw9vGOiXmHeIsEDdD6igpD sW/g5uPNEG81YQy5UQqOkmV+i6lyEwMHwe9eZkt63Tgm0/bKnRXlTxSdujUfyo+VUBw7 F4NFUH3gk9e4M1tdS48PdhNdPLmC3bBy9AqXCx+UXWueIu/T/hJfZOoa9dMCy4p60Mj9 oBPws1WMdcYpMx6943pj0hYJ1GcUvC1mnpKNyeQxBLPhbhAZt5ZQDtolclD9z5IB6+HP n8Jw== X-Gm-Message-State: AE9vXwMsTzSk75XSNC/3RnWlqTySjxvUevoQdrsN4Ha2NmTt9EscGr4fYT3tdvh1tvJFA3V3 X-Received: by 10.98.193.193 with SMTP id i184mr46115099pfg.69.1474354237243; Mon, 19 Sep 2016 23:50:37 -0700 (PDT) Received: from localhost.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by smtp.gmail.com with ESMTPSA id h66sm76039248pfc.47.2016.09.19.23.50.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Sep 2016 23:50:36 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH net-next v2 01/10] bnxt_en: Use RSS flags defined in the bnxt_hsi.h file. Date: Tue, 20 Sep 2016 02:50:19 -0400 Message-Id: <1474354228-3221-2-git-send-email-michael.chan@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1474354228-3221-1-git-send-email-michael.chan@broadcom.com> References: <1474354228-3221-1-git-send-email-michael.chan@broadcom.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org And remove redundant definitions of the same flags. Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 ++++---- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 5 ----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 228c964..cee0e8d 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -3419,10 +3419,10 @@ static int bnxt_hwrm_vnic_set_rss(struct bnxt *bp, u16 vnic_id, bool set_rss) bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_VNIC_RSS_CFG, -1, -1); if (set_rss) { - vnic->hash_type = BNXT_RSS_HASH_TYPE_FLAG_IPV4 | - BNXT_RSS_HASH_TYPE_FLAG_TCP_IPV4 | - BNXT_RSS_HASH_TYPE_FLAG_IPV6 | - BNXT_RSS_HASH_TYPE_FLAG_TCP_IPV6; + vnic->hash_type = VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4 | + VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4 | + VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6 | + VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6; req.hash_type = cpu_to_le32(vnic->hash_type); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index 23e04a6..db4814e 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -389,11 +389,6 @@ struct rx_tpa_end_cmp_ext { #define INVALID_HW_RING_ID ((u16)-1) -#define BNXT_RSS_HASH_TYPE_FLAG_IPV4 0x01 -#define BNXT_RSS_HASH_TYPE_FLAG_TCP_IPV4 0x02 -#define BNXT_RSS_HASH_TYPE_FLAG_IPV6 0x04 -#define BNXT_RSS_HASH_TYPE_FLAG_TCP_IPV6 0x08 - /* The hardware supports certain page sizes. Use the supported page sizes * to allocate the rings. */