openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'net-is_enabled' 

Javier Martinez Canillas says:

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

This trivial series replace the open coding to check for a Kconfig symbol
being built-in or module, with IS_ENABLED() macro that does exactly that.

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: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2016-09-10 21:19:12 -07:00
parent 34c1b089d9 65b323e2ff
commit 48b4e51fa7
10 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/appletalk/ddp.c
View File

@ -1278,7 +1278,7 @@ static int atalk_getname(struct socket *sock, struct sockaddr *uaddr,
return err; return err;
} }
#if defined(CONFIG_IPDDP) || defined(CONFIG_IPDDP_MODULE) #if IS_ENABLED(CONFIG_IPDDP)
static __inline__ int is_ip_over_ddp(struct sk_buff *skb) static __inline__ int is_ip_over_ddp(struct sk_buff *skb)
{ {
return skb->data[12] == 22; return skb->data[12] == 22;

12
net/atm/lec.c
View File

@ -31,7 +31,7 @@
#include <linux/atmlec.h> #include <linux/atmlec.h>
/* Proxy LEC knows about bridging */ /* Proxy LEC knows about bridging */
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) #if IS_ENABLED(CONFIG_BRIDGE)
#include "../bridge/br_private.h" #include "../bridge/br_private.h"
static unsigned char bridge_ula_lec[] = { 0x01, 0x80, 0xc2, 0x00, 0x00 }; static unsigned char bridge_ula_lec[] = { 0x01, 0x80, 0xc2, 0x00, 0x00 };
@ -121,7 +121,7 @@ static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
/* Device structures */ /* Device structures */
static struct net_device *dev_lec[MAX_LEC_ITF]; static struct net_device *dev_lec[MAX_LEC_ITF];
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) #if IS_ENABLED(CONFIG_BRIDGE)
static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev) static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
{ {
char *buff; char *buff;
@ -155,7 +155,7 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
sk->sk_data_ready(sk); sk->sk_data_ready(sk);
} }
} }
#endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */ #endif /* IS_ENABLED(CONFIG_BRIDGE) */
/* /*
* Open/initialize the netdevice. This is called (in the current kernel) * Open/initialize the netdevice. This is called (in the current kernel)
@ -222,7 +222,7 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
pr_debug("skbuff head:%lx data:%lx tail:%lx end:%lx\n", pr_debug("skbuff head:%lx data:%lx tail:%lx end:%lx\n",
(long)skb->head, (long)skb->data, (long)skb_tail_pointer(skb), (long)skb->head, (long)skb->data, (long)skb_tail_pointer(skb),
(long)skb_end_pointer(skb)); (long)skb_end_pointer(skb));
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) #if IS_ENABLED(CONFIG_BRIDGE)
if (memcmp(skb->data, bridge_ula_lec, sizeof(bridge_ula_lec)) == 0) if (memcmp(skb->data, bridge_ula_lec, sizeof(bridge_ula_lec)) == 0)
lec_handle_bridge(skb, dev); lec_handle_bridge(skb, dev);
#endif #endif
@ -426,7 +426,7 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
(unsigned short)(0xffff & mesg->content.normal.flag); (unsigned short)(0xffff & mesg->content.normal.flag);
break; break;
case l_should_bridge: case l_should_bridge:
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) #if IS_ENABLED(CONFIG_BRIDGE)
{ {
pr_debug("%s: bridge zeppelin asks about %pM\n", pr_debug("%s: bridge zeppelin asks about %pM\n",
dev->name, mesg->content.proxy.mac_addr); dev->name, mesg->content.proxy.mac_addr);
@ -452,7 +452,7 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
sk->sk_data_ready(sk); sk->sk_data_ready(sk);
} }
} }
#endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */ #endif /* IS_ENABLED(CONFIG_BRIDGE) */
break; break;
default: default:
pr_info("%s: Unknown message type %d\n", dev->name, mesg->type); pr_info("%s: Unknown message type %d\n", dev->name, mesg->type);

3
net/core/dev.c
View File

@ -3904,8 +3904,7 @@ static void net_tx_action(struct softirq_action *h)
} }
} }
#if (defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)) && \ #if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_ATM_LANE)
(defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE))
/* This hook is defined here for ATM LANE */ /* This hook is defined here for ATM LANE */
int (*br_fdb_test_addr_hook)(struct net_device *dev, int (*br_fdb_test_addr_hook)(struct net_device *dev,
unsigned char *addr) __read_mostly; unsigned char *addr) __read_mostly;

2
net/ipv4/ip_output.c
View File

@ -490,7 +490,7 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
to->tc_index = from->tc_index; to->tc_index = from->tc_index;
#endif #endif
nf_copy(to, from); nf_copy(to, from);
#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) #if IS_ENABLED(CONFIG_IP_VS)
to->ipvs_property = from->ipvs_property; to->ipvs_property = from->ipvs_property;
#endif #endif
skb_copy_secmark(to, from); skb_copy_secmark(to, from);

2
net/l2tp/l2tp_core.h
View File

@ -139,7 +139,7 @@ struct l2tp_session {
void (*session_close)(struct l2tp_session *session); void (*session_close)(struct l2tp_session *session);
void (*ref)(struct l2tp_session *session); void (*ref)(struct l2tp_session *session);
void (*deref)(struct l2tp_session *session); void (*deref)(struct l2tp_session *session);
#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE) #if IS_ENABLED(CONFIG_L2TP_DEBUGFS)
void (*show)(struct seq_file *m, void *priv); void (*show)(struct seq_file *m, void *priv);
#endif #endif
uint8_t priv[0]; /* private data */ uint8_t priv[0]; /* private data */

4
net/l2tp/l2tp_eth.c
View File

@ -195,7 +195,7 @@ static void l2tp_eth_delete(struct l2tp_session *session)
} }
} }
#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE) #if IS_ENABLED(CONFIG_L2TP_DEBUGFS)
static void l2tp_eth_show(struct seq_file *m, void *arg) static void l2tp_eth_show(struct seq_file *m, void *arg)
{ {
struct l2tp_session *session = arg; struct l2tp_session *session = arg;
@ -268,7 +268,7 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p
priv->tunnel_sock = tunnel->sock; priv->tunnel_sock = tunnel->sock;
session->recv_skb = l2tp_eth_dev_recv; session->recv_skb = l2tp_eth_dev_recv;
session->session_close = l2tp_eth_delete; session->session_close = l2tp_eth_delete;
#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE) #if IS_ENABLED(CONFIG_L2TP_DEBUGFS)
session->show = l2tp_eth_show; session->show = l2tp_eth_show;
#endif #endif

4
net/l2tp/l2tp_ppp.c
View File

@ -552,7 +552,7 @@ static int pppol2tp_create(struct net *net, struct socket *sock, int kern)
return error; return error;
} }
#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE) #if IS_ENABLED(CONFIG_L2TP_DEBUGFS)
static void pppol2tp_show(struct seq_file *m, void *arg) static void pppol2tp_show(struct seq_file *m, void *arg)
{ {
struct l2tp_session *session = arg; struct l2tp_session *session = arg;
@ -723,7 +723,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
session->recv_skb = pppol2tp_recv; session->recv_skb = pppol2tp_recv;
session->session_close = pppol2tp_session_close; session->session_close = pppol2tp_session_close;
#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE) #if IS_ENABLED(CONFIG_L2TP_DEBUGFS)
session->show = pppol2tp_show; session->show = pppol2tp_show;
#endif #endif

6
net/sched/cls_flow.c
View File

@ -29,7 +29,7 @@
#include <net/route.h> #include <net/route.h>
#include <net/flow_dissector.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> #include <net/netfilter/nf_conntrack.h>
#endif #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) 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); return addr_fold(skb->nfct);
#else #else
return 0; return 0;
#endif #endif
} }
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) #if IS_ENABLED(CONFIG_NF_CONNTRACK)
#define CTTUPLE(skb, member) \ #define CTTUPLE(skb, member) \
({ \ ({ \
enum ip_conntrack_info ctinfo; \ enum ip_conntrack_info ctinfo; \

2
net/sctp/auth.c
View File

@ -48,7 +48,7 @@ static struct sctp_hmac sctp_hmac_list[SCTP_AUTH_NUM_HMACS] = {
/* id 2 is reserved as well */ /* id 2 is reserved as well */
.hmac_id = SCTP_AUTH_HMAC_ID_RESERVED_2, .hmac_id = SCTP_AUTH_HMAC_ID_RESERVED_2,
}, },
#if defined (CONFIG_CRYPTO_SHA256) || defined (CONFIG_CRYPTO_SHA256_MODULE) #if IS_ENABLED(CONFIG_CRYPTO_SHA256)
{ {
.hmac_id = SCTP_AUTH_HMAC_ID_SHA256, .hmac_id = SCTP_AUTH_HMAC_ID_SHA256,
.hmac_name = "hmac(sha256)", .hmac_name = "hmac(sha256)",

2
net/xfrm/xfrm_algo.c
View File

@ -17,7 +17,7 @@
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <net/xfrm.h> #include <net/xfrm.h>
#if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE) #if IS_ENABLED(CONFIG_INET_ESP) || IS_ENABLED(CONFIG_INET6_ESP)
#include <net/esp.h> #include <net/esp.h>
#endif #endif