diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 20:08:38 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 20:08:38 +1000 |
commit | d653b0b3717843efa3e72bdcaf37b2a0b598eea0 (patch) | |
tree | c95b2471229d71fb0ced2f37723b7223e9987474 /net/xfrm | |
parent | 3f607a5176e202974afb3dbb31d0f37cb2f4551f (diff) | |
parent | 76e1488440013a0d737fbb9d1f8efe226138f7f0 (diff) |
Merge branch 'akpm-current/current'
Conflicts:
arch/arm64/Kconfig
mm/shmem.c
Diffstat (limited to 'net/xfrm')
-rw-r--r-- | net/xfrm/xfrm_policy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 0525d78ba328..beeed602aeb3 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -389,7 +389,7 @@ redo: if (h != h0) continue; hlist_del(&pol->bydst); - hlist_add_after(entry0, &pol->bydst); + hlist_add_behind(&pol->bydst, entry0); } entry0 = &pol->bydst; } @@ -654,7 +654,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) break; } if (newpos) - hlist_add_after(newpos, &policy->bydst); + hlist_add_behind(&policy->bydst, newpos); else hlist_add_head(&policy->bydst, chain); xfrm_pol_hold(policy); |