[PATCH net-next 2/2] bnxt_en: tc: only the function prototypes need to be wrapped in #ifdef

2017-10-06 Thread Jonathan Toppins 
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);
-- 
2.13.6

Re: [PATCH net-next 2/2] bnxt_en: tc: only the function prototypes need to be wrapped in #ifdef

2017-10-06 Thread Michael Chan 
On Fri, Oct 6, 2017 at 12:48 PM, Jonathan Toppins  wrote:
> There is no reason to wrap the data structures inside the ifdef.

What's so bad about wrapping unused data structures inside #ifdef?
These structures are only used if CONFIG_BNXT_FLOWER_OFFLOAD is
defined.

Re: [PATCH net-next 2/2] bnxt_en: tc: only the function prototypes need to be wrapped in #ifdef

2017-10-06 Thread David Miller 
From: Michael Chan 
Date: Fri, 6 Oct 2017 18:27:31 -0700

> On Fri, Oct 6, 2017 at 12:48 PM, Jonathan Toppins  wrote:
>> There is no reason to wrap the data structures inside the ifdef.
> 
> What's so bad about wrapping unused data structures inside #ifdef?
> These structures are only used if CONFIG_BNXT_FLOWER_OFFLOAD is
> defined.

Yeah I agree, this ifdef is actually a good way to trap unintentional
usage of those datastructures so it's doubly best to keep the ifdef.