Merge branch 'master' of git://1984.lsi.us.es/net

3 files changed, 5 insertions, 3 deletions

diff --git a/include/linux/netfilter/xt_set.h b/include/linux/netfilter/xt_set.h
index c0405ac92870..e3a9978f259f 100644
--- a/include/linux/netfilter/xt_set.h
+++ b/include/linux/netfilter/xt_set.h
@@ -58,8 +58,8 @@ struct xt_set_info_target_v1 {
 struct xt_set_info_target_v2 {
         struct xt_set_info add_set;
         struct xt_set_info del_set;
-        u32 flags;
-        u32 timeout;
+        __u32 flags;
+        __u32 timeout;
 };
 
 #endif /*_XT_SET_H*/
diff --git a/include/net/netfilter/xt_log.h b/include/net/netfilter/xt_log.h
index 7e1544e8f70d..9d9756cca013 100644
--- a/include/net/netfilter/xt_log.h
+++ b/include/net/netfilter/xt_log.h
@@ -47,7 +47,7 @@ static void sb_close(struct sbuff *m)
         if (likely(m != &emergency))
                 kfree(m);
         else {
-                xchg(&emergency_ptr, m);
+                emergency_ptr = m;
                 local_bh_enable();
         }
 }
diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
index 0c8e43810ce3..138b75e41fdd 100644
--- a/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@ -281,8 +281,10 @@ out:
         info->ct = ct;
         return 0;
 
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 err4:
         rcu_read_unlock();
+#endif
 err3:
         nf_conntrack_free(ct);
 err2: