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, 24 insertions, 24 deletions

diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index 36400b266896..965397af9a80 100644
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -126,7 +126,7 @@ static int parse_addr(__le16 *addr, char *str)
         if (INVALID_END_CHAR(*str))
                 return -1;
 
-        *addr = dn_htons((area << 10) | node);
+        *addr = cpu_to_le16((area << 10) | node);
 
         return 0;
 }
@@ -201,7 +201,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
                 return 0;
         }
 
-        dn_addr2asc(dn_ntohs(decnet_address), addr);
+        dn_addr2asc(le16_to_cpu(decnet_address), addr);
         len = strlen(addr);
         addr[len++] = '\n';
 
@@ -354,8 +354,8 @@ static ctl_table dn_table[] = {
                 .data = node_name,
                 .maxlen = 7,
                 .mode = 0644,
-                .proc_handler = &proc_dostring,
-                .strategy = &sysctl_string,
+                .proc_handler = proc_dostring,
+                .strategy = sysctl_string,
         },
         {
                 .ctl_name = NET_DECNET_DEFAULT_DEVICE,
@@ -371,8 +371,8 @@ static ctl_table dn_table[] = {
                 .data = &decnet_time_wait,
                 .maxlen = sizeof(int),
                 .mode = 0644,
-                .proc_handler = &proc_dointvec_minmax,
-                .strategy = &sysctl_intvec,
+                .proc_handler = proc_dointvec_minmax,
+                .strategy = sysctl_intvec,
                 .extra1 = &min_decnet_time_wait,
                 .extra2 = &max_decnet_time_wait
         },
@@ -382,8 +382,8 @@ static ctl_table dn_table[] = {
                 .data = &decnet_dn_count,
                 .maxlen = sizeof(int),
                 .mode = 0644,
-                .proc_handler = &proc_dointvec_minmax,
-                .strategy = &sysctl_intvec,
+                .proc_handler = proc_dointvec_minmax,
+                .strategy = sysctl_intvec,
                 .extra1 = &min_state_count,
                 .extra2 = &max_state_count
         },
@@ -393,8 +393,8 @@ static ctl_table dn_table[] = {
                 .data = &decnet_di_count,
                 .maxlen = sizeof(int),
                 .mode = 0644,
-                .proc_handler = &proc_dointvec_minmax,
-                .strategy = &sysctl_intvec,
+                .proc_handler = proc_dointvec_minmax,
+                .strategy = sysctl_intvec,
                 .extra1 = &min_state_count,
                 .extra2 = &max_state_count
         },
@@ -404,8 +404,8 @@ static ctl_table dn_table[] = {
                 .data = &decnet_dr_count,
                 .maxlen = sizeof(int),
                 .mode = 0644,
-                .proc_handler = &proc_dointvec_minmax,
-                .strategy = &sysctl_intvec,
+                .proc_handler = proc_dointvec_minmax,
+                .strategy = sysctl_intvec,
                 .extra1 = &min_state_count,
                 .extra2 = &max_state_count
         },
@@ -415,8 +415,8 @@ static ctl_table dn_table[] = {
                 .data = &decnet_dst_gc_interval,
                 .maxlen = sizeof(int),
                 .mode = 0644,
-                .proc_handler = &proc_dointvec_minmax,
-                .strategy = &sysctl_intvec,
+                .proc_handler = proc_dointvec_minmax,
+                .strategy = sysctl_intvec,
                 .extra1 = &min_decnet_dst_gc_interval,
                 .extra2 = &max_decnet_dst_gc_interval
         },
@@ -426,8 +426,8 @@ static ctl_table dn_table[] = {
                 .data = &decnet_no_fc_max_cwnd,
                 .maxlen = sizeof(int),
                 .mode = 0644,
-                .proc_handler = &proc_dointvec_minmax,
-                .strategy = &sysctl_intvec,
+                .proc_handler = proc_dointvec_minmax,
+                .strategy = sysctl_intvec,
                 .extra1 = &min_decnet_no_fc_max_cwnd,
                 .extra2 = &max_decnet_no_fc_max_cwnd
         },
@@ -437,8 +437,8 @@ static ctl_table dn_table[] = {
                 .data = &sysctl_decnet_mem,
                 .maxlen = sizeof(sysctl_decnet_mem),
                 .mode = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
+                .proc_handler = proc_dointvec,
+                .strategy = sysctl_intvec,
         },
         {
                 .ctl_name = NET_DECNET_RMEM,
@@ -446,8 +446,8 @@ static ctl_table dn_table[] = {
                 .data = &sysctl_decnet_rmem,
                 .maxlen = sizeof(sysctl_decnet_rmem),
                 .mode = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
+                .proc_handler = proc_dointvec,
+                .strategy = sysctl_intvec,
         },
         {
                 .ctl_name = NET_DECNET_WMEM,
@@ -455,8 +455,8 @@ static ctl_table dn_table[] = {
                 .data = &sysctl_decnet_wmem,
                 .maxlen = sizeof(sysctl_decnet_wmem),
                 .mode = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
+                .proc_handler = proc_dointvec,
+                .strategy = sysctl_intvec,
         },
         {
                 .ctl_name = NET_DECNET_DEBUG_LEVEL,
@@ -464,8 +464,8 @@ static ctl_table dn_table[] = {
                 .data = &decnet_debug_level,
                 .maxlen = sizeof(int),
                 .mode = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
+                .proc_handler = proc_dointvec,
+                .strategy = sysctl_intvec,
         },
         {0}
 };