diff options
| author | David S. Miller <davem@davemloft.net> | 2018-12-18 19:49:48 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-18 19:49:48 +0300 |
| commit | 77c7a7b3e7da2c97c182c7e57a16d16c6b555c24 (patch) | |
| tree | 6bde171b004d5cee63dd161dc9a66e16a48f7eae /net/ipv6 | |
| parent | b12c97d45cd061862b79fe02aa41a73d685ec7a1 (diff) | |
| parent | 77990464bb39eb0f5cd41e4f9e3d6411f2883cac (diff) | |
| download | linux-77c7a7b3e7da2c97c182c7e57a16d16c6b555c24.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2018-12-18
1) Add xfrm policy selftest scripts.
From Florian Westphal.
2) Split inexact policies into four different search list
classes and use the rbtree infrastructure to store/lookup
the policies. This is to improve the policy lookup
performance after the flowcache removal.
Patches from Florian Westphal.
3) Various coding style fixes, from Colin Ian King.
4) Fix policy lookup logic after adding the inexact policy
search tree infrastructure. From Florian Westphal.
5) Remove a useless remove BUG_ON from xfrm6_dst_ifdown.
From Li RongQing.
6) Use the correct policy direction for lookups on hash
rebuilding. From Florian Westphal.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/xfrm6_policy.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index d35bcf92969c..769f8f78d3b8 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -262,7 +262,6 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, if (xdst->u.rt6.rt6i_idev->dev == dev) { struct inet6_dev *loopback_idev = in6_dev_get(dev_net(dev)->loopback_dev); - BUG_ON(!loopback_idev); do { in6_dev_put(xdst->u.rt6.rt6i_idev); |