From f827373ff7aa0f53131a164c4be9e4ef788c2db9 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 26 Sep 2006 22:26:21 -0700 Subject: [PATCH] --- yaml --- r: 36795 b: refs/heads/master c: e8192f367cb3dcbefaa4109d26f3b1645b0c6b56 h: refs/heads/master i: 36793: e7772e108137a0ac4272cc0c318972fb0f9681e2 36791: 4c6230579be3943c57953875e56c427b585fdb1f v: v3 --- [refs] | 2 +- trunk/net/ipv4/multipath_wrandom.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1c4e57238679..e83e6a0b683f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f20f4a60d74b0d7e2a5dafd5e7d5760f44ce2f30 +refs/heads/master: e8192f367cb3dcbefaa4109d26f3b1645b0c6b56 diff --git a/trunk/net/ipv4/multipath_wrandom.c b/trunk/net/ipv4/multipath_wrandom.c index 32dbd6906a5d..92b04823e034 100644 --- a/trunk/net/ipv4/multipath_wrandom.c +++ b/trunk/net/ipv4/multipath_wrandom.c @@ -128,8 +128,8 @@ static unsigned char __multipath_lookup_weight(const struct flowi *fl, /* find state entry for destination */ list_for_each_entry_rcu(d, &target_route->dests, list) { - __u32 targetnetwork = fl->fl4_dst & - (0xFFFFFFFF >> (32 - d->prefixlen)); + __be32 targetnetwork = fl->fl4_dst & + inet_make_mask(d->prefixlen); if ((targetnetwork & d->netmask) == d->network) { weight = d->nh_info->nh_weight;