net: use IS_ENABLED(CONFIG_IPV6)
Instead of testing defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
这个提交包含在:
@@ -105,7 +105,7 @@ static inline int sctp_rcv_checksum(struct sk_buff *skb)
|
||||
struct sctp_input_cb {
|
||||
union {
|
||||
struct inet_skb_parm h4;
|
||||
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
|
||||
#if IS_ENABLED(CONFIG_IPV6)
|
||||
struct inet6_skb_parm h6;
|
||||
#endif
|
||||
} header;
|
||||
|
@@ -637,7 +637,7 @@ void sctp_addr_wq_timeout_handler(unsigned long arg)
|
||||
" for cmd %d at entry %p\n", &sctp_addr_waitq, &addrw->a, addrw->state,
|
||||
addrw);
|
||||
|
||||
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
|
||||
#if IS_ENABLED(CONFIG_IPV6)
|
||||
/* Now we send an ASCONF for each association */
|
||||
/* Note. we currently don't handle link local IPv6 addressees */
|
||||
if (addrw->a.sa.sa_family == AF_INET6) {
|
||||
|
@@ -6841,7 +6841,7 @@ struct proto sctp_prot = {
|
||||
.sockets_allocated = &sctp_sockets_allocated,
|
||||
};
|
||||
|
||||
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
|
||||
#if IS_ENABLED(CONFIG_IPV6)
|
||||
|
||||
struct proto sctpv6_prot = {
|
||||
.name = "SCTPv6",
|
||||
@@ -6872,4 +6872,4 @@ struct proto sctpv6_prot = {
|
||||
.memory_allocated = &sctp_memory_allocated,
|
||||
.sockets_allocated = &sctp_sockets_allocated,
|
||||
};
|
||||
#endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */
|
||||
#endif /* IS_ENABLED(CONFIG_IPV6) */
|
||||
|
在新工单中引用
屏蔽一个用户