| Message ID | 20201104090010.17558-1-steffen.klassert@secunet.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | pull request (net): ipsec 2020-11-04 | expand |
| Context | Check | Description |
|---|---|---|
| jkicinski/tree_selection | success | Guessing tree name failed - patch did not apply |
On Wed, 4 Nov 2020 10:00:08 +0100 Steffen Klassert wrote: > 1) Fix packet receiving of standard IP tunnels when the xfrm_interface > module is installed. From Xin Long. > > 2) Fix a race condition between spi allocating and hash list > resizing. From zhuoliang zhang. Pulled, thank you!
1) Fix packet receiving of standard IP tunnels when the xfrm_interface module is installed. From Xin Long. 2) Fix a race condition between spi allocating and hash list resizing. From zhuoliang zhang. Please pull or let me know if there are problems. Thanks! The following changes since commit 3fdd47c3b40ac48e6e6e5904cf24d12e6e073a96: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (2020-10-08 14:25:46 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master for you to fetch changes up to a779d91314ca7208b7feb3ad817b62904397c56d: net: xfrm: fix a race condition during allocing spi (2020-10-23 09:08:55 +0200) ---------------------------------------------------------------- Xin Long (1): xfrm: interface: fix the priorities for ipip and ipv6 tunnels zhuoliang zhang (1): net: xfrm: fix a race condition during allocing spi net/ipv4/xfrm4_tunnel.c | 4 ++-- net/ipv6/xfrm6_tunnel.c | 4 ++-- net/xfrm/xfrm_interface.c | 8 ++++---- net/xfrm/xfrm_state.c | 8 +++++--- 4 files changed, 13 insertions(+), 11 deletions(-)