Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 8 Apr 2009 20:39:54 +0000 (13:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Apr 2009 20:39:54 +0000 (13:39 -0700)
include/net/netfilter/nf_conntrack_expect.h
net/ipv6/netfilter/ip6_tables.c
net/netfilter/Kconfig
net/netfilter/nf_conntrack_expect.c

index ab17a159ac66192bdc4e6a445f3f1325653c571e..a9652806d0df59fbcdbbb09cf8d4cf353c310390 100644 (file)
@@ -99,9 +99,12 @@ void nf_ct_expect_init(struct nf_conntrack_expect *, unsigned int, u_int8_t,
                       const union nf_inet_addr *,
                       u_int8_t, const __be16 *, const __be16 *);
 void nf_ct_expect_put(struct nf_conntrack_expect *exp);
-int nf_ct_expect_related(struct nf_conntrack_expect *expect);
 int nf_ct_expect_related_report(struct nf_conntrack_expect *expect, 
                                u32 pid, int report);
+static inline int nf_ct_expect_related(struct nf_conntrack_expect *expect)
+{
+       return nf_ct_expect_related_report(expect, 0, 0);
+}
 
 #endif /*_NF_CONNTRACK_EXPECT_H*/
 
index dfed176aed37a05698c62f887e0227d95c1faff4..800ae854247163f8890ea244060835eccc5f0a99 100644 (file)
@@ -1033,6 +1033,8 @@ static struct xt_counters *alloc_counters(struct xt_table *table)
 
        xt_free_table_info(info);
 
+       return counters;
+
  free_counters:
        vfree(counters);
  nomem:
index bb279bf59a1b9147b5951268ec70d48662eb50f2..2329c5f5055195ddaf81f6286d5510dab7e2ee5f 100644 (file)
@@ -374,7 +374,7 @@ config NETFILTER_XT_TARGET_HL
 
 config NETFILTER_XT_TARGET_LED
        tristate '"LED" target support'
-       depends on LEDS_CLASS && LED_TRIGGERS
+       depends on LEDS_CLASS && LEDS_TRIGGERS
        depends on NETFILTER_ADVANCED
        help
          This option adds a `LED' target, which allows you to blink LEDs in
index 3940f996a2e4ac180b8ed135e9f7c423f670b66d..afde8f991646eadfa6afc72d6390fb27b5ecaf61 100644 (file)
@@ -372,7 +372,7 @@ static inline int __nf_ct_expect_check(struct nf_conntrack_expect *expect)
        struct net *net = nf_ct_exp_net(expect);
        struct hlist_node *n;
        unsigned int h;
-       int ret = 0;
+       int ret = 1;
 
        if (!master_help->helper) {
                ret = -ESHUTDOWN;
@@ -412,41 +412,23 @@ out:
        return ret;
 }
 
-int nf_ct_expect_related(struct nf_conntrack_expect *expect)
+int nf_ct_expect_related_report(struct nf_conntrack_expect *expect, 
+                               u32 pid, int report)
 {
        int ret;
 
        spin_lock_bh(&nf_conntrack_lock);
        ret = __nf_ct_expect_check(expect);
-       if (ret < 0)
+       if (ret <= 0)
                goto out;
 
+       ret = 0;
        nf_ct_expect_insert(expect);
-       atomic_inc(&expect->use);
-       spin_unlock_bh(&nf_conntrack_lock);
-       nf_ct_expect_event(IPEXP_NEW, expect);
-       nf_ct_expect_put(expect);
-       return ret;
-out:
        spin_unlock_bh(&nf_conntrack_lock);
+       nf_ct_expect_event_report(IPEXP_NEW, expect, pid, report);
        return ret;
-}
-EXPORT_SYMBOL_GPL(nf_ct_expect_related);
-
-int nf_ct_expect_related_report(struct nf_conntrack_expect *expect, 
-                               u32 pid, int report)
-{
-       int ret;
-
-       spin_lock_bh(&nf_conntrack_lock);
-       ret = __nf_ct_expect_check(expect);
-       if (ret < 0)
-               goto out;
-       nf_ct_expect_insert(expect);
 out:
        spin_unlock_bh(&nf_conntrack_lock);
-       if (ret == 0)
-               nf_ct_expect_event_report(IPEXP_NEW, expect, pid, report);
        return ret;
 }
 EXPORT_SYMBOL_GPL(nf_ct_expect_related_report);