github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-14 16:10:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: ipv6: introduce ip6_dst_mtu_maybe_forward

Browse Source 
Replace ip6_dst_mtu_forward with ip6_dst_mtu_maybe_forward and
reuse this code in ip6_mtu. Actually these two functions were
almost duplicates, this change will simplify the maintaince of
mtu calculation code.

Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vadim Fedorenko 2021-07-20 23:06:27 +03:00 committed by David S. Miller
parent 7c804e91df
commit 427faee167
4 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/ip6_route.h
View File

@ -316,12 +316,13 @@ static inline bool rt6_duplicate_nexthop(struct fib6_info *a, struct fib6_info *
!lwtunnel_cmp_encap(nha->fib_nh_lws, nhb->fib_nh_lws); !lwtunnel_cmp_encap(nha->fib_nh_lws, nhb->fib_nh_lws);
} }
static inline unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst) static inline unsigned int ip6_dst_mtu_maybe_forward(const struct dst_entry *dst,
bool forwarding)
{ {
struct inet6_dev *idev; struct inet6_dev *idev;
unsigned int mtu; unsigned int mtu;
if (dst_metric_locked(dst, RTAX_MTU)) { if (!forwarding || dst_metric_locked(dst, RTAX_MTU)) {
mtu = dst_metric_raw(dst, RTAX_MTU); mtu = dst_metric_raw(dst, RTAX_MTU);
if (mtu) if (mtu)
goto out; goto out;

2
net/ipv6/ip6_output.c
View File

@ -607,7 +607,7 @@ int ip6_forward(struct sk_buff *skb)
} }
} }
mtu = ip6_dst_mtu_forward(dst); mtu = ip6_dst_mtu_maybe_forward(dst, true);
if (mtu < IPV6_MIN_MTU) if (mtu < IPV6_MIN_MTU)
mtu = IPV6_MIN_MTU; mtu = IPV6_MIN_MTU;

20
net/ipv6/route.c
View File

@ -3201,25 +3201,7 @@ static unsigned int ip6_default_advmss(const struct dst_entry *dst)
INDIRECT_CALLABLE_SCOPE unsigned int ip6_mtu(const struct dst_entry *dst) INDIRECT_CALLABLE_SCOPE unsigned int ip6_mtu(const struct dst_entry *dst)
{ {
struct inet6_dev *idev; return ip6_dst_mtu_maybe_forward(dst, false);
unsigned int mtu;
mtu = dst_metric_raw(dst, RTAX_MTU);
if (mtu)
goto out;
mtu = IPV6_MIN_MTU;
rcu_read_lock();
idev = __in6_dev_get(dst->dev);
if (idev)
mtu = idev->cnf.mtu6;
rcu_read_unlock();
out:
mtu = min_t(unsigned int, mtu, IP6_MAX_MTU);
return mtu - lwtunnel_headroom(dst->lwtstate, mtu);
} }
EXPORT_INDIRECT_CALLABLE(ip6_mtu); EXPORT_INDIRECT_CALLABLE(ip6_mtu);

2
net/netfilter/nf_flow_table_core.c
View File

@ -99,7 +99,7 @@ static int flow_offload_fill_route(struct flow_offload *flow,
flow_tuple->mtu = ip_dst_mtu_maybe_forward(dst, true); flow_tuple->mtu = ip_dst_mtu_maybe_forward(dst, true);
break; break;
case NFPROTO_IPV6: case NFPROTO_IPV6:
flow_tuple->mtu = ip6_dst_mtu_forward(dst); flow_tuple->mtu = ip6_dst_mtu_maybe_forward(dst, true);
break; break;
} }