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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

1 files changed, 14 insertions, 15 deletions

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 821bd1cdec04..c754670b7fca 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -131,7 +131,6 @@ static struct dst_ops dn_dst_ops = {
         .negative_advice =      dn_dst_negative_advice,
         .link_failure =         dn_dst_link_failure,
         .update_pmtu =          dn_dst_update_pmtu,
-        .entry_size =           sizeof(struct dn_route),
         .entries =              ATOMIC_INIT(0),
 };
 
@@ -312,7 +311,7 @@ static int dn_insert_route(struct dn_route *rt, unsigned hash, struct dn_route *
         return 0;
 }
 
-void dn_run_flush(unsigned long dummy)
+static void dn_run_flush(unsigned long dummy)
 {
         int i;
         struct dn_route *rt, *next;
@@ -476,7 +475,7 @@ static int dn_route_rx_packet(struct sk_buff *skb)
                 printk(KERN_DEBUG
                         "DECnet: dn_route_rx_packet: rt_flags=0x%02x dev=%s len=%d src=0x%04hx dst=0x%04hx err=%d type=%d\n",
                         (int)cb->rt_flags, devname, skb->len,
-                        dn_ntohs(cb->src), dn_ntohs(cb->dst),
+                        le16_to_cpu(cb->src), le16_to_cpu(cb->dst),
                         err, skb->pkt_type);
         }
 
@@ -576,7 +575,7 @@ int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type
 {
         struct dn_skb_cb *cb;
         unsigned char flags = 0;
-        __u16 len = dn_ntohs(*(__le16 *)skb->data);
+        __u16 len = le16_to_cpu(*(__le16 *)skb->data);
         struct dn_dev *dn = (struct dn_dev *)dev->dn_ptr;
         unsigned char padlen = 0;
 
@@ -774,7 +773,7 @@ static int dn_rt_bug(struct sk_buff *skb)
                 struct dn_skb_cb *cb = DN_SKB_CB(skb);
 
                 printk(KERN_DEBUG "dn_rt_bug: skb from:%04x to:%04x\n",
-                                dn_ntohs(cb->src), dn_ntohs(cb->dst));
+                                le16_to_cpu(cb->src), le16_to_cpu(cb->dst));
         }
 
         kfree_skb(skb);
@@ -817,7 +816,7 @@ static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res)
 
 static inline int dn_match_addr(__le16 addr1, __le16 addr2)
 {
-        __u16 tmp = dn_ntohs(addr1) ^ dn_ntohs(addr2);
+        __u16 tmp = le16_to_cpu(addr1) ^ le16_to_cpu(addr2);
         int match = 16;
         while(tmp) {
                 tmp >>= 1;
@@ -887,8 +886,8 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
         if (decnet_debug_level & 16)
                 printk(KERN_DEBUG
                        "dn_route_output_slow: dst=%04x src=%04x mark=%d"
-                       " iif=%d oif=%d\n", dn_ntohs(oldflp->fld_dst),
-                       dn_ntohs(oldflp->fld_src),
+                       " iif=%d oif=%d\n", le16_to_cpu(oldflp->fld_dst),
+                       le16_to_cpu(oldflp->fld_src),
                        oldflp->mark, init_net.loopback_dev->ifindex, oldflp->oif);
 
         /* If we have an output interface, verify its a DECnet device */
@@ -960,7 +959,7 @@ source_ok:
                 printk(KERN_DEBUG
                        "dn_route_output_slow: initial checks complete."
                        " dst=%o4x src=%04x oif=%d try_hard=%d\n",
-                       dn_ntohs(fl.fld_dst), dn_ntohs(fl.fld_src),
+                       le16_to_cpu(fl.fld_dst), le16_to_cpu(fl.fld_src),
                        fl.oif, try_hard);
 
         /*
@@ -1185,7 +1184,7 @@ static int dn_route_output_key(struct dst_entry **pprt, struct flowi *flp, int f
 
         err = __dn_route_output_key(pprt, flp, flags);
         if (err == 0 && flp->proto) {
-                err = xfrm_lookup(pprt, flp, NULL, 0);
+                err = xfrm_lookup(&init_net, pprt, flp, NULL, 0);
         }
         return err;
 }
@@ -1196,8 +1195,8 @@ int dn_route_output_sock(struct dst_entry **pprt, struct flowi *fl, struct sock
 
         err = __dn_route_output_key(pprt, fl, flags & MSG_TRYHARD);
         if (err == 0 && fl->proto) {
-                err = xfrm_lookup(pprt, fl, sk, (flags & MSG_DONTWAIT) ?
-                                                0 : XFRM_LOOKUP_WAIT);
+                err = xfrm_lookup(&init_net, pprt, fl, sk,
+                                 (flags & MSG_DONTWAIT) ? 0 : XFRM_LOOKUP_WAIT);
         }
         return err;
 }
@@ -1423,7 +1422,7 @@ e_neighbour:
         goto done;
 }
 
-int dn_route_input(struct sk_buff *skb)
+static int dn_route_input(struct sk_buff *skb)
 {
         struct dn_route *rt;
         struct dn_skb_cb *cb = DN_SKB_CB(skb);
@@ -1712,8 +1711,8 @@ static int dn_rt_cache_seq_show(struct seq_file *seq, void *v)
 
         seq_printf(seq, "%-8s %-7s %-7s %04d %04d %04d\n",
                         rt->u.dst.dev ? rt->u.dst.dev->name : "*",
-                        dn_addr2asc(dn_ntohs(rt->rt_daddr), buf1),
-                        dn_addr2asc(dn_ntohs(rt->rt_saddr), buf2),
+                        dn_addr2asc(le16_to_cpu(rt->rt_daddr), buf1),
+                        dn_addr2asc(le16_to_cpu(rt->rt_saddr), buf2),
                         atomic_read(&rt->u.dst.__refcnt),
                         rt->u.dst.__use,
                         (int) dst_metric(&rt->u.dst, RTAX_RTT));