From 272a5c87fc54225cc5f5ecff3cebc2cddc5bd3f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Maravi=C4=87?= <igorm@etf.rs>
Date: Mon, 12 Dec 2011 02:58:22 +0000
Subject: [PATCH] --- yaml --- r: 278829 b: refs/heads/master c:
 a3bf7ae9ae1036636d8900b35a3880e871eceb39 h: refs/heads/master i:   278827:
 2d9786e6e41300c1b5524b77c1e0e5713ff7e4d1 v: v3

---
 [refs]                      | 2 +-
 trunk/net/core/secure_seq.c | 2 +-
 trunk/net/core/skbuff.c     | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 256ab9f45638..248bf14051cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecedb6ae908e3a8a19942da921a3ffb1c5a0d6ab
+refs/heads/master: a3bf7ae9ae1036636d8900b35a3880e871eceb39
diff --git a/trunk/net/core/secure_seq.c b/trunk/net/core/secure_seq.c
index 9fbca46f3e74..6fd44606fdd1 100644
--- a/trunk/net/core/secure_seq.c
+++ b/trunk/net/core/secure_seq.c
@@ -134,7 +134,7 @@ u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport)
 EXPORT_SYMBOL_GPL(secure_ipv4_port_ephemeral);
 #endif
 
-#if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE)
+#if IS_ENABLED(CONFIG_IP_DCCP)
 u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
 				__be16 sport, __be16 dport)
 {
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index fd3646209b65..da0c97f2fab4 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -452,7 +452,7 @@ static void skb_release_head_state(struct sk_buff *skb)
 		WARN_ON(in_irq());
 		skb->destructor(skb);
 	}
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
 	nf_conntrack_put(skb->nfct);
 #endif
 #ifdef NET_SKBUFF_NF_DEFRAG_NEEDED
@@ -602,15 +602,14 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
 	new->ip_summed		= old->ip_summed;
 	skb_copy_queue_mapping(new, old);
 	new->priority		= old->priority;
-#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
+#if IS_ENABLED(CONFIG_IP_VS)
 	new->ipvs_property	= old->ipvs_property;
 #endif
 	new->protocol		= old->protocol;
 	new->mark		= old->mark;
 	new->skb_iif		= old->skb_iif;
 	__nf_copy(new, old);
-#if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
-    defined(CONFIG_NETFILTER_XT_TARGET_TRACE_MODULE)
+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
 	new->nf_trace		= old->nf_trace;
 #endif
 #ifdef CONFIG_NET_SCHED