diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-13 15:52:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-13 15:52:14 -0500 |
commit | 0dbaee3b37e118a96bb7b8eb0d9bbaeeb46264be (patch) | |
tree | 37000c5d7e663e4ae9800a7bcde9934984b8bae9 /net/xfrm/xfrm_policy.c | |
parent | cc6f02dd490dac4ad821d5077b934c9b37037cd0 (diff) |
net: Abstract default ADVMSS behind an accessor.
Make all RTAX_ADVMSS metric accesses go through a new helper function,
dst_metric_advmss().
Leave the actual default metric as "zero" in the real metric slot,
and compute the actual default value dynamically via a new dst_ops
AF specific callback.
For stacked IPSEC routes, we use the advmss of the path which
preserves existing behavior.
Unlike ipv4/ipv6, DecNET ties the advmss to the mtu and thus updates
advmss on pmtu updates. This inconsistency in advmss handling
results in more raw metric accesses than I wish we ended up with.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
-rw-r--r-- | net/xfrm/xfrm_policy.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 6e50ccd8c532..36936c8ae961 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -2361,6 +2361,11 @@ static int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first, | |||
2361 | return 1; | 2361 | return 1; |
2362 | } | 2362 | } |
2363 | 2363 | ||
2364 | static unsigned int xfrm_default_advmss(const struct dst_entry *dst) | ||
2365 | { | ||
2366 | return dst_metric_advmss(dst->path); | ||
2367 | } | ||
2368 | |||
2364 | int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) | 2369 | int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) |
2365 | { | 2370 | { |
2366 | struct net *net; | 2371 | struct net *net; |
@@ -2378,6 +2383,8 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) | |||
2378 | dst_ops->kmem_cachep = xfrm_dst_cache; | 2383 | dst_ops->kmem_cachep = xfrm_dst_cache; |
2379 | if (likely(dst_ops->check == NULL)) | 2384 | if (likely(dst_ops->check == NULL)) |
2380 | dst_ops->check = xfrm_dst_check; | 2385 | dst_ops->check = xfrm_dst_check; |
2386 | if (likely(dst_ops->default_advmss == NULL)) | ||
2387 | dst_ops->default_advmss = xfrm_default_advmss; | ||
2381 | if (likely(dst_ops->negative_advice == NULL)) | 2388 | if (likely(dst_ops->negative_advice == NULL)) |
2382 | dst_ops->negative_advice = xfrm_negative_advice; | 2389 | dst_ops->negative_advice = xfrm_negative_advice; |
2383 | if (likely(dst_ops->link_failure == NULL)) | 2390 | if (likely(dst_ops->link_failure == NULL)) |