Skip to content

Commit

Permalink
net: sched: use IS_ENABLED() instead of checking for built-in or module
Browse files Browse the repository at this point in the history
The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either
built-in or as a module, use that macro instead of open coding the same.

Using the macro makes the code more readable by helping abstract away some
of the Kconfig built-in and module enable details.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Javier Martinez Canillas authored and David S. Miller committed Sep 11, 2016
1 parent 9dd7994 commit 0013de3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/sched/cls_flow.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <net/route.h>
#include <net/flow_dissector.h>

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
#include <net/netfilter/nf_conntrack.h>
#endif

Expand Down Expand Up @@ -125,14 +125,14 @@ static u32 flow_get_mark(const struct sk_buff *skb)

static u32 flow_get_nfct(const struct sk_buff *skb)
{
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
return addr_fold(skb->nfct);
#else
return 0;
#endif
}

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
#define CTTUPLE(skb, member) \
({ \
enum ip_conntrack_info ctinfo; \
Expand Down

0 comments on commit 0013de3

Please sign in to comment.