From patchwork Fri Oct 6 19:48:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Toppins X-Patchwork-Id: 822697 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y80ZF4DVHz9t2m for ; Sat, 7 Oct 2017 06:48:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752750AbdJFTsj (ORCPT ); Fri, 6 Oct 2017 15:48:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59192 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752378AbdJFTsi (ORCPT ); Fri, 6 Oct 2017 15:48:38 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 83589C004786; Fri, 6 Oct 2017 19:48:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 83589C004786 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jtoppins@redhat.com Received: from jtoppins.rdu.csb (dhcp137-178.rdu.redhat.com [10.13.137.178]) by smtp.corp.redhat.com (Postfix) with ESMTP id 312FC70904; Fri, 6 Oct 2017 19:48:38 +0000 (UTC) From: Jonathan Toppins To: michael.chan@broadcom.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next 2/2] bnxt_en: tc: only the function prototypes need to be wrapped in #ifdef Date: Fri, 6 Oct 2017 15:48:31 -0400 Message-Id: In-Reply-To: <1a4d96f368f199bba0425012f50d55d634484cce.1507319311.git.jtoppins@redhat.com> References: <1a4d96f368f199bba0425012f50d55d634484cce.1507319311.git.jtoppins@redhat.com> In-Reply-To: <1a4d96f368f199bba0425012f50d55d634484cce.1507319311.git.jtoppins@redhat.com> References: <1a4d96f368f199bba0425012f50d55d634484cce.1507319311.git.jtoppins@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 06 Oct 2017 19:48:38 +0000 (UTC) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is no reason to wrap the data structures inside the ifdef. Signed-off-by: Jonathan Toppins --- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h index 6c4c1ed279ef..6e771e9eed51 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h @@ -10,8 +10,6 @@ #ifndef BNXT_TC_H #define BNXT_TC_H -#ifdef CONFIG_BNXT_FLOWER_OFFLOAD - /* Structs used for storing the filter/actions of the TC cmd. */ struct bnxt_tc_l2_key { @@ -133,6 +131,8 @@ struct bnxt_tc_flow_node { struct rcu_head rcu; }; +#if IS_ENABLED(CONFIG_BNXT_FLOWER_OFFLOAD) + int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid, struct tc_cls_flower_offload *cls_flower); int bnxt_init_tc(struct bnxt *bp);