Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/benet/be_main.c
Simple merge

diff --cc drivers/net/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/vxge/vxge-config.c
Simple merge

diff --cc include/net/netfilter/nf_conntrack_ecache.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv6/raw.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge

diff --cc net/netfilter/xt_iprange.c
index d3eb5ed,73c33a4..b46626c
--- 1/net/netfilter/xt_iprange.c
--- 2/net/netfilter/xt_iprange.c
+++ b/net/netfilter/xt_iprange.c
@@@ -75,30 -73,18 +73,30 @@@ iprange_mt6(const struct sk_buff *skb, 
        bool m;
  
        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  = iprange_ipv6_lt(&iph->saddr, &info->src_min.in6);
+               m |= iprange_ipv6_lt(&info->src_max.in6, &iph->saddr);
                m ^= !!(info->flags & IPRANGE_SRC_INV);
 -              if (m)
 +              if (m) {
 +                      pr_debug("src IP %pI6 NOT in range %s%pI6-%pI6\n",
 +                               &iph->saddr,
 +                               (info->flags & IPRANGE_SRC_INV) ? "(INV) " : "",
 +                               &info->src_min.in6,
 +                               &info->src_max.in6);
                        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  = iprange_ipv6_lt(&iph->daddr, &info->dst_min.in6);
+               m |= iprange_ipv6_lt(&info->dst_max.in6, &iph->daddr);
                m ^= !!(info->flags & IPRANGE_DST_INV);
 -              if (m)
 +              if (m) {
 +                      pr_debug("dst IP %pI6 NOT in range %s%pI6-%pI6\n",
 +                               &iph->daddr,
 +                               (info->flags & IPRANGE_DST_INV) ? "(INV) " : "",
 +                               &info->dst_min.in6,
 +                               &info->dst_max.in6);
                        return false;
 +              }
        }
        return true;
  }