diff options
| author | fan.du <fan.du@windriver.com> | 2013-07-30 08:33:53 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-31 14:56:36 -0700 |
| commit | ca4c3fc24e293719fe7410c4e63da9b6bc633b83 (patch) | |
| tree | 0461841f3d10b11a26ebe1a0adc99c7b00a489a2 /net/xfrm | |
| parent | ba361cb3d4c977e2b94b5d97905f66b4d48964de (diff) | |
| download | linux-stable-ca4c3fc24e293719fe7410c4e63da9b6bc633b83.tar.gz linux-stable-ca4c3fc24e293719fe7410c4e63da9b6bc633b83.tar.bz2 linux-stable-ca4c3fc24e293719fe7410c4e63da9b6bc633b83.zip | |
net: split rt_genid for ipv4 and ipv6
Current net name space has only one genid for both IPv4 and IPv6, it has below
drawbacks:
- Add/delete an IPv4 address will invalidate all IPv6 routing table entries.
- Insert/remove XFRM policy will also invalidate both IPv4/IPv6 routing table
entries even when the policy is only applied for one address family.
Thus, this patch attempt to split one genid for two to cater for IPv4 and IPv6
separately in a fine granularity.
Signed-off-by: Fan Du <fan.du@windriver.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index e52cab3591dd..d8da6b8c6ba8 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -660,7 +660,13 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) xfrm_pol_hold(policy); net->xfrm.policy_count[dir]++; atomic_inc(&flow_cache_genid); - rt_genid_bump(net); + + /* After previous checking, family can either be AF_INET or AF_INET6 */ + if (policy->family == AF_INET) + rt_genid_bump_ipv4(net); + else + rt_genid_bump_ipv6(net); + if (delpol) { xfrm_policy_requeue(delpol, policy); __xfrm_policy_unlink(delpol, dir); |