Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  netfilter: replace old NF_ARP calls with NFPROTO_ARP
  netfilter: fix compilation error with NAT=n
  netfilter: xt_recent: use proc_create_data()
  netfilter: snmp nat leaks memory in case of failure
  netfilter: xt_iprange: fix range inversion match
  netfilter: netns: use NFPROTO_NUMPROTO instead of NUMPROTO for tables array
  netfilter: ctnetlink: remove obsolete NAT dependency from Kconfig
  pkt_sched: sch_generic: Fix oops in sch_teql
  dccp: Port redirection support for DCCP
  tcp: Fix IPv6 fallout from 'Port redirection support for TCP'
  netdev: change name dropping error codes
  ipvs: Update CONFIG_IP_VS_IPV6 description and help text

6 files changed, 14 insertions, 13 deletions

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 78892cf2b02..25dcef9f219 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -271,7 +271,6 @@ config NF_CONNTRACK_TFTP
 config NF_CT_NETLINK
         tristate 'Connection tracking netlink interface'
         select NETFILTER_NETLINK
-        depends on NF_NAT=n || NF_NAT
         default m if NETFILTER_ADVANCED=n
         help
           This option enables support for a netlink-based userspace interface
diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig
index 05048e40326..79a69805221 100644
--- a/net/netfilter/ipvs/Kconfig
+++ b/net/netfilter/ipvs/Kconfig
@@ -25,11 +25,13 @@ menuconfig IP_VS
 if IP_VS
 
 config  IP_VS_IPV6
-        bool "IPv6 support for IPVS (DANGEROUS)"
+        bool "IPv6 support for IPVS"
         depends on EXPERIMENTAL && (IPV6 = y || IP_VS = IPV6)
         ---help---
           Add IPv6 support to IPVS. This is incomplete and might be dangerous.
 
+          See http://www.mindbasket.com/ipvs for more information.
+
           Say N if unsure.
 
 config  IP_VS_DEBUG
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 2e4ad9671e1..a040d46f85d 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -813,6 +813,7 @@ out:
         return err;
 }
 
+#ifdef CONFIG_NF_NAT_NEEDED
 static int
 ctnetlink_parse_nat_setup(struct nf_conn *ct,
                           enum nf_nat_manip_type manip,
@@ -840,6 +841,7 @@ ctnetlink_parse_nat_setup(struct nf_conn *ct,
 
         return parse_nat_setup(ct, manip, attr);
 }
+#endif
 
 static int
 ctnetlink_change_status(struct nf_conn *ct, struct nlattr *cda[])
diff --git a/net/netfilter/xt_NFQUEUE.c b/net/netfilter/xt_NFQUEUE.c
index 2cc1fff4930..f9977b3311f 100644
--- a/net/netfilter/xt_NFQUEUE.c
+++ b/net/netfilter/xt_NFQUEUE.c
@@ -48,7 +48,7 @@ static struct xt_target nfqueue_tg_reg[] __read_mostly = {
         },
         {
                 .name           = "NFQUEUE",
-                .family         = NF_ARP,
+                .family         = NFPROTO_ARP,
                 .target         = nfqueue_tg,
                 .targetsize     = sizeof(struct xt_NFQ_info),
                 .me             = THIS_MODULE,
diff --git a/net/netfilter/xt_iprange.c b/net/netfilter/xt_iprange.c
index 6f62c36948d..7ac54eab0b0 100644
--- a/net/netfilter/xt_iprange.c
+++ b/net/netfilter/xt_iprange.c
@@ -61,7 +61,7 @@ iprange_mt4(const struct sk_buff *skb, const struct xt_match_param *par)
         if (info->flags & IPRANGE_SRC) {
                 m  = ntohl(iph->saddr) < ntohl(info->src_min.ip);
                 m |= ntohl(iph->saddr) > ntohl(info->src_max.ip);
-                m ^= info->flags & IPRANGE_SRC_INV;
+                m ^= !!(info->flags & IPRANGE_SRC_INV);
                 if (m) {
                         pr_debug("src IP " NIPQUAD_FMT " NOT in range %s"
                                  NIPQUAD_FMT "-" NIPQUAD_FMT "\n",
@@ -75,7 +75,7 @@ iprange_mt4(const struct sk_buff *skb, const struct xt_match_param *par)
         if (info->flags & IPRANGE_DST) {
                 m  = ntohl(iph->daddr) < ntohl(info->dst_min.ip);
                 m |= ntohl(iph->daddr) > ntohl(info->dst_max.ip);
-                m ^= info->flags & IPRANGE_DST_INV;
+                m ^= !!(info->flags & IPRANGE_DST_INV);
                 if (m) {
                         pr_debug("dst IP " NIPQUAD_FMT " NOT in range %s"
                                  NIPQUAD_FMT "-" NIPQUAD_FMT "\n",
@@ -114,14 +114,14 @@ iprange_mt6(const struct sk_buff *skb, const struct xt_match_param *par)
         if (info->flags & IPRANGE_SRC) {
                 m  = iprange_ipv6_sub(&iph->saddr, &info->src_min.in6) < 0;
                 m |= iprange_ipv6_sub(&iph->saddr, &info->src_max.in6) > 0;
-                m ^= info->flags & IPRANGE_SRC_INV;
+                m ^= !!(info->flags & IPRANGE_SRC_INV);
                 if (m)
                         return false;
         }
         if (info->flags & IPRANGE_DST) {
                 m  = iprange_ipv6_sub(&iph->daddr, &info->dst_min.in6) < 0;
                 m |= iprange_ipv6_sub(&iph->daddr, &info->dst_max.in6) > 0;
-                m ^= info->flags & IPRANGE_DST_INV;
+                m ^= !!(info->flags & IPRANGE_DST_INV);
                 if (m)
                         return false;
         }
diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index 4ebd4ca9a99..280c471bcdf 100644
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -318,15 +318,15 @@ static bool recent_mt_check(const struct xt_mtchk_param *par)
         for (i = 0; i < ip_list_hash_size; i++)
                 INIT_LIST_HEAD(&t->iphash[i]);
 #ifdef CONFIG_PROC_FS
-        t->proc = proc_create(t->name, ip_list_perms, recent_proc_dir,
-                  &recent_mt_fops);
+        t->proc = proc_create_data(t->name, ip_list_perms, recent_proc_dir,
+                  &recent_mt_fops, t);
         if (t->proc == NULL) {
                 kfree(t);
                 goto out;
         }
 #ifdef CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT
-        t->proc_old = proc_create(t->name, ip_list_perms, proc_old_dir,
-                      &recent_old_fops);
+        t->proc_old = proc_create_data(t->name, ip_list_perms, proc_old_dir,
+                      &recent_old_fops, t);
         if (t->proc_old == NULL) {
                 remove_proc_entry(t->name, proc_old_dir);
                 kfree(t);
@@ -334,11 +334,9 @@ static bool recent_mt_check(const struct xt_mtchk_param *par)
         }
         t->proc_old->uid   = ip_list_uid;
         t->proc_old->gid   = ip_list_gid;
-        t->proc_old->data  = t;
 #endif
         t->proc->uid       = ip_list_uid;
         t->proc->gid       = ip_list_gid;
-        t->proc->data      = t;
 #endif
         spin_lock_bh(&recent_lock);
         list_add_tail(&t->list, &tables);