summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorDavid Ahern <dsahern@gmail.com>2019-09-17 10:39:49 -0700
committerJakub Kicinski <jakub.kicinski@netronome.com>2019-09-20 18:23:33 -0700
commit77d5bc7e6a6cf8bbeca31aab7f0c5449a5eee762 (patch)
treec9eb74276e11bbe3b2deecda27f2ebd2fcb3c0a2 /drivers/infiniband
parente84622ce24482f6e9c1bf29d3bdd556eb587ff41 (diff)
downloadlinux-stable-77d5bc7e6a6cf8bbeca31aab7f0c5449a5eee762.tar.gz
linux-stable-77d5bc7e6a6cf8bbeca31aab7f0c5449a5eee762.tar.bz2
linux-stable-77d5bc7e6a6cf8bbeca31aab7f0c5449a5eee762.zip
ipv4: Revert removal of rt_uses_gateway
Julian noted that rt_uses_gateway has a more subtle use than 'is gateway set': https://lore.kernel.org/netdev/alpine.LFD.2.21.1909151104060.2546@ja.home.ssi.bg/ Revert that part of the commit referenced in the Fixes tag. Currently, there are no u8 holes in 'struct rtable'. There is a 4-byte hole in the second cacheline which contains the gateway declaration. So move rt_gw_family down to the gateway declarations since they are always used together, and then re-use that u8 for rt_uses_gateway. End result is that rtable size is unchanged. Fixes: 1550c171935d ("ipv4: Prepare rtable for IPv6 gateway") Reported-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: David Ahern <dsahern@gmail.com> Reviewed-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/core/addr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 9b76a8fcdd24..bf539c34ccd3 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -352,7 +352,7 @@ static bool has_gateway(const struct dst_entry *dst, sa_family_t family)
if (family == AF_INET) {
rt = container_of(dst, struct rtable, dst);
- return rt->rt_gw_family == AF_INET;
+ return rt->rt_uses_gateway;
}
rt6 = container_of(dst, struct rt6_info, dst);