mbox

[0/5] pull request (net-next): ipsec-next 2022-07-20

Message ID 20220720081746.1187382-1-steffen.klassert@secunet.com (mailing list archive)
State Accepted
Delegated to: Netdev Maintainers
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master

Message

Steffen Klassert July 20, 2022, 8:17 a.m. UTC
1) Don't set DST_NOPOLICY in IPv4, a recent patch made this
   superfluous. From Eyal Birger.

2) Convert alg_key to flexible array member to avoid an iproute2
   compile warning when built with gcc-12.
   From Stephen Hemminger.

3) xfrm_register_km and xfrm_unregister_km do always return 0
   so change the type to void. From Zhengchao Shao.

4) Fix spelling mistake in esp6.c
   From Zhang Jiaming.

5) Improve the wording of comment above XFRM_OFFLOAD flags.
   From Petr Vaněk.

Please pull or let me know if there are problems.

Thanks!

The following changes since commit 6cbd05b2d07a651e00c76d287a5f44994cbafe60:

  Merge tag 'ieee802154-for-net-next-2022-06-09' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next (2022-06-09 23:21:29 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master

for you to fetch changes up to 5e25c25aa2c08fb9a79476e029c0b1e3dcd70566:

  xfrm: improve wording of comment above XFRM_OFFLOAD flags (2022-07-04 10:20:11 +0200)

----------------------------------------------------------------
Eyal Birger (1):
      xfrm: no need to set DST_NOPOLICY in IPv4

Petr Vaněk (1):
      xfrm: improve wording of comment above XFRM_OFFLOAD flags

Stephen Hemminger (1):
      xfrm: convert alg_key to flexible array member

Zhang Jiaming (1):
      esp6: Fix spelling mistake

Zhengchao Shao (1):
      xfrm: change the type of xfrm_register_km and xfrm_unregister_km

 drivers/net/vrf.c         |  2 +-
 include/net/route.h       |  3 +--
 include/net/xfrm.h        |  4 ++--
 include/uapi/linux/xfrm.h | 12 ++++++------
 net/ipv4/route.c          | 24 ++++++++----------------
 net/ipv6/esp6.c           |  4 ++--
 net/key/af_key.c          |  6 +-----
 net/xfrm/xfrm_state.c     |  6 ++----
 net/xfrm/xfrm_user.c      |  6 ++----
 9 files changed, 25 insertions(+), 42 deletions(-)

Comments

Steffen Klassert July 25, 2022, 12:23 p.m. UTC | #1
On Wed, Jul 20, 2022 at 10:17:41AM +0200, Steffen Klassert wrote:
> 1) Don't set DST_NOPOLICY in IPv4, a recent patch made this
>    superfluous. From Eyal Birger.
> 
> 2) Convert alg_key to flexible array member to avoid an iproute2
>    compile warning when built with gcc-12.
>    From Stephen Hemminger.
> 
> 3) xfrm_register_km and xfrm_unregister_km do always return 0
>    so change the type to void. From Zhengchao Shao.
> 
> 4) Fix spelling mistake in esp6.c
>    From Zhang Jiaming.
> 
> 5) Improve the wording of comment above XFRM_OFFLOAD flags.
>    From Petr Vaněk.
> 
> Please pull or let me know if there are problems.

Can anyone reconsider this pull request?

It is marked as Accepted in patchwork, but seems not to be included
in net-next.

Thanks!
Jakub Kicinski July 25, 2022, 6:18 p.m. UTC | #2
On Mon, 25 Jul 2022 14:23:02 +0200 Steffen Klassert wrote:
> On Wed, Jul 20, 2022 at 10:17:41AM +0200, Steffen Klassert wrote:
> > 1) Don't set DST_NOPOLICY in IPv4, a recent patch made this
> >    superfluous. From Eyal Birger.
> > 
> > 2) Convert alg_key to flexible array member to avoid an iproute2
> >    compile warning when built with gcc-12.
> >    From Stephen Hemminger.
> > 
> > 3) xfrm_register_km and xfrm_unregister_km do always return 0
> >    so change the type to void. From Zhengchao Shao.
> > 
> > 4) Fix spelling mistake in esp6.c
> >    From Zhang Jiaming.
> > 
> > 5) Improve the wording of comment above XFRM_OFFLOAD flags.
> >    From Petr Vaněk.
> > 
> > Please pull or let me know if there are problems.  
> 
> Can anyone reconsider this pull request?
> 
> It is marked as Accepted in patchwork, but seems not to be included
> in net-next.

FTR DaveM pulled it this morning (e222dc8d8408 ("Merge branch 'master'
of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next"))
sorry for the wait!