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

diff --git a/include/linux/netfilter/xt_set.h b/include/linux/netfilter/xt_set.h
index c0405ac928701a7d234986576baa69624ec1b71c..e3a9978f259f55425202664754e13c5504ed579e 100644 (file)
--- 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 7e1544e8f70d36599205fd821f1cdc34705d1676..9d9756cca0132bbc603c313b0ecb18670fef3bb0 100644 (file)
--- 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 0c8e43810ce363190c2c49477a3490ee6a077191..138b75e41fddba8b0cdf55f693f8c44c264c4568 100644 (file)
--- 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: