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

diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
index c8cac6c7f881..ded8c44fb848 100644
--- a/net/ipv4/fib_hash.c
+++ b/net/ipv4/fib_hash.c
@@ -247,7 +247,7 @@ fn_hash_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result
 {
         int err;
         struct fn_zone *fz;
-        struct fn_hash *t = (struct fn_hash*)tb->tb_data;
+        struct fn_hash *t = (struct fn_hash *)tb->tb_data;
 
         read_lock(&fib_hash_lock);
         for (fz = t->fn_zone_list; fz; fz = fz->fz_next) {
@@ -283,7 +283,7 @@ fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib
         struct fib_node *f;
         struct fib_info *fi = NULL;
         struct fib_info *last_resort;
-        struct fn_hash *t = (struct fn_hash*)tb->tb_data;
+        struct fn_hash *t = (struct fn_hash *)tb->tb_data;
         struct fn_zone *fz = t->fn_zones[0];
 
         if (fz == NULL)
@@ -548,7 +548,7 @@ out:
 
 static int fn_hash_delete(struct fib_table *tb, struct fib_config *cfg)
 {
-        struct fn_hash *table = (struct fn_hash*)tb->tb_data;
+        struct fn_hash *table = (struct fn_hash *)tb->tb_data;
         struct fib_node *f;
         struct fib_alias *fa, *fa_to_delete;
         struct fn_zone *fz;
@@ -748,7 +748,7 @@ static int fn_hash_dump(struct fib_table *tb, struct sk_buff *skb, struct netlin
 {
         int m, s_m;
         struct fn_zone *fz;
-        struct fn_hash *table = (struct fn_hash*)tb->tb_data;
+        struct fn_hash *table = (struct fn_hash *)tb->tb_data;
 
         s_m = cb->args[2];
         read_lock(&fib_hash_lock);
@@ -845,10 +845,10 @@ static struct fib_alias *fib_get_first(struct seq_file *seq)
                         struct hlist_node *node;
                         struct fib_node *fn;
 
-                        hlist_for_each_entry(fn,node,iter->hash_head,fn_hash) {
+                        hlist_for_each_entry(fn, node, iter->hash_head, fn_hash) {
                                 struct fib_alias *fa;
 
-                                list_for_each_entry(fa,&fn->fn_alias,fa_list) {
+                                list_for_each_entry(fa, &fn->fn_alias, fa_list) {
                                         iter->fn = fn;
                                         iter->fa = fa;
                                         goto out;