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

diff --git a/net/ipv4/multipath_random.c b/net/ipv4/multipath_random.c
index b8c289f247cb..047e861f06bd 100644
--- a/net/ipv4/multipath_random.c
+++ b/net/ipv4/multipath_random.c
@@ -74,7 +74,7 @@ static void random_select_route(const struct flowi *flp,
 
         /* count all candidate */
         for (rt = rcu_dereference(first); rt;
-             rt = rcu_dereference(rt->u.rt_next)) {
+             rt = rcu_dereference(rt->u.dst.rt_next)) {
                 if ((rt->u.dst.flags & DST_BALANCED) != 0 &&
                     multipath_comparekeys(&rt->fl, flp))
                         ++candidate_count;
@@ -90,7 +90,7 @@ static void random_select_route(const struct flowi *flp,
                 /* find chosen candidate and adjust GC data for all candidates
                  * to ensure they stay in cache
                  */
-                for (rt = first; rt; rt = rt->u.rt_next) {
+                for (rt = first; rt; rt = rt->u.dst.rt_next) {
                         if ((rt->u.dst.flags & DST_BALANCED) != 0 &&
                             multipath_comparekeys(&rt->fl, flp)) {
                                 rt->u.dst.lastuse = jiffies;