Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorJakub Kicinski <kuba@kernel.org>
Thu, 2 Jun 2022 00:44:03 +0000 (17:44 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 2 Jun 2022 00:44:04 +0000 (17:44 -0700)
commit2440d2068a7517f60003b0e12e5fadcebd14cda3
treeaf2fcf7346eb69037528d93be5d68324adc2c4d2
parent38a4762e4ba61e848c61a3b9eaa8f83cbed07b2d
parent6821ad8770340825f17962cf5ef64ebaffee7fd7
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec

Steffen Klassert says:

====================
ipsec 2022-06-01

1) Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process"
   From Michal Kubecek.

2) Don't set IPv4 DF bit when encapsulating IPv6 frames below 1280 bytes.
   From Maciej Żenczykowski.

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec:
  xfrm: do not set IPv4 DF flag when encapsulating IPv6 frames <= 1280 bytes.
  Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process"
====================

Link: https://lore.kernel.org/r/20220601103349.2297361-1-steffen.klassert@secunet.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/key/af_key.c