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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
  [IPV4]: Restore multipath routing after rt_next changes.
  [XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch.
  [NET]: Reorder fields of struct dst_entry
  [DECNET]: Convert decnet route to use the new dst_entry 'next' pointer
  [IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer
  [IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer
  [NET]: Introduce union in struct dst_entry to hold 'next' pointer
  [DECNET]: fix misannotation of linkinfo_dn
  [DECNET]: FRA_{DST,SRC} are le16 for decnet
  [UDP]: UDP can use sk_hash to speedup lookups
  [NET]: Fix whitespace errors.
  [NET] XFRM: Fix whitespace errors.
  [NET] X25: Fix whitespace errors.
  [NET] WANROUTER: Fix whitespace errors.
  [NET] UNIX: Fix whitespace errors.
  [NET] TIPC: Fix whitespace errors.
  [NET] SUNRPC: Fix whitespace errors.
  [NET] SCTP: Fix whitespace errors.
  [NET] SCHED: Fix whitespace errors.
  [NET] RXRPC: Fix whitespace errors.
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c
index 8f88964099ef..e9909aeb43e9 100644
--- a/net/netrom/nr_route.c
+++ b/net/netrom/nr_route.c
@@ -781,8 +781,8 @@ int nr_route_frame(struct sk_buff *skb, ax25_cb *ax25)
 
         if (ax25 != NULL) {
                 ret = nr_add_node(nr_src, "", &ax25->dest_addr, ax25->digipeat,
-                                  ax25->ax25_dev->dev, 0,
-                                  sysctl_netrom_obsolescence_count_initialiser);
+                                  ax25->ax25_dev->dev, 0,
+                                  sysctl_netrom_obsolescence_count_initialiser);
                 if (ret)
                         return ret;
         }
@@ -861,8 +861,8 @@ static void *nr_node_start(struct seq_file *seq, loff_t *pos)
         struct nr_node *nr_node;
         struct hlist_node *node;
         int i = 1;
- 
-        spin_lock_bh(&nr_node_list_lock);
+
+        spin_lock_bh(&nr_node_list_lock);
         if (*pos == 0)
                 return SEQ_START_TOKEN;
 
@@ -879,8 +879,8 @@ static void *nr_node_next(struct seq_file *seq, void *v, loff_t *pos)
 {
         struct hlist_node *node;
         ++*pos;
-        
-        node = (v == SEQ_START_TOKEN)  
+
+        node = (v == SEQ_START_TOKEN)
                 ? nr_node_list.first
                 : ((struct nr_node *)v)->node_node.next;
 
@@ -963,8 +963,8 @@ static void *nr_neigh_next(struct seq_file *seq, void *v, loff_t *pos)
 {
         struct hlist_node *node;
         ++*pos;
-        
-        node = (v == SEQ_START_TOKEN)  
+
+        node = (v == SEQ_START_TOKEN)
                 ? nr_neigh_list.first
                 : ((struct nr_neigh *)v)->neigh_node.next;
 
@@ -997,7 +997,7 @@ static int nr_neigh_show(struct seq_file *seq, void *v)
 
                 if (nr_neigh->digipeat != NULL) {
                         for (i = 0; i < nr_neigh->digipeat->ndigi; i++)
-                                seq_printf(seq, " %s", 
+                                seq_printf(seq, " %s",
                                            ax2asc(buf, &nr_neigh->digipeat->calls[i]));
                 }