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

diff --git a/net/rxrpc/connection.c b/net/rxrpc/connection.c
index 93d2c55ad2d5..a7c929a9fdca 100644
--- a/net/rxrpc/connection.c
+++ b/net/rxrpc/connection.c
@@ -163,7 +163,7 @@ int rxrpc_create_connection(struct rxrpc_transport *trans,
                 conn = list_entry(_p, struct rxrpc_connection, link);
                 if (conn->addr.sin_port == candidate->addr.sin_port     &&
                     conn->security_ix   == candidate->security_ix       &&
-                    conn->service_id    == candidate->service_id        && 
+                    conn->service_id    == candidate->service_id        &&
                     conn->in_clientflag == 0)
                         goto found_in_graveyard;
         }
@@ -247,13 +247,13 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
                     conn->in_epoch              == x_epoch      &&
                     conn->conn_id               == x_connid     &&
                     conn->security_ix           == x_secix      &&
-                    conn->service_id            == x_servid     && 
+                    conn->service_id            == x_servid     &&
                     conn->in_clientflag         == x_clflag)
                         goto found_active;
         }
         read_unlock(&peer->conn_lock);
 
-        /* [uncommon case] not active 
+        /* [uncommon case] not active
          * - create a candidate for a new record if an inbound connection
          * - only examine the graveyard for an outbound connection
          */
@@ -286,7 +286,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
                     conn->in_epoch              == x_epoch      &&
                     conn->conn_id               == x_connid     &&
                     conn->security_ix           == x_secix      &&
-                    conn->service_id            == x_servid     && 
+                    conn->service_id            == x_servid     &&
                     conn->in_clientflag         == x_clflag)
                         goto found_active_second_chance;
         }
@@ -299,7 +299,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
                     conn->in_epoch              == x_epoch      &&
                     conn->conn_id               == x_connid     &&
                     conn->security_ix           == x_secix      &&
-                    conn->service_id            == x_servid     && 
+                    conn->service_id            == x_servid     &&
                     conn->in_clientflag         == x_clflag)
                         goto found_in_graveyard;
         }