diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-28 13:17:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-28 13:17:16 -0700 |
| commit | 1b077ce1c5be7cdb0e40ea2c2565ed8c878b05e9 (patch) | |
| tree | cc0e447ed9fde7c3b2755729eadaf7c79802aa34 /net/ipv4/esp4.c | |
| parent | 007b312c6f294770de01fbc0643610145012d244 (diff) | |
| parent | b5a1d1fe0cbb9d20ba661134a09561af1dc9ebf5 (diff) | |
| download | linux-stable-1b077ce1c5be7cdb0e40ea2c2565ed8c878b05e9.tar.gz linux-stable-1b077ce1c5be7cdb0e40ea2c2565ed8c878b05e9.tar.bz2 linux-stable-1b077ce1c5be7cdb0e40ea2c2565ed8c878b05e9.zip | |
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 2021-06-28
1) Remove an unneeded error assignment in esp4_gro_receive().
From Yang Li.
2) Add a new byseq state hashtable to find acquire states faster.
From Sabrina Dubroca.
3) Remove some unnecessary variables in pfkey_create().
From zuoqilin.
4) Remove the unused description from xfrm_type struct.
From Florian Westphal.
5) Fix a spelling mistake in the comment of xfrm_state_ok().
From gushengxian.
6) Replace hdr_off indirections by a small helper function.
From Florian Westphal.
7) Remove xfrm4_output_finish and xfrm6_output_finish declarations,
they are not used anymore.From Antony Antony.
8) Remove xfrm replay indirections.
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/ipv4/esp4.c')
| -rw-r--r-- | net/ipv4/esp4.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 35803ab7ac80..f5362b9d75eb 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -1198,7 +1198,6 @@ static int esp4_rcv_cb(struct sk_buff *skb, int err) static const struct xfrm_type esp_type = { - .description = "ESP4", .owner = THIS_MODULE, .proto = IPPROTO_ESP, .flags = XFRM_TYPE_REPLAY_PROT, |