Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0013de38 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by David S. Miller
Browse files

net: sched: use IS_ENABLED() instead of checking for built-in or module 



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: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9dd79945

net/sched/cls_flow.c

+3 −3
Original line number Diff line number Diff line
@@ -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
@@ -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;					\