diff options
author | David S. Miller <davem@davemloft.net> | 2018-03-29 11:22:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-03-29 11:22:31 -0400 |
commit | 56455e0998dd3a8096eb3fdc2c8e870a29a77bef (patch) | |
tree | 34a57fad02fee185d7f77e5f05db322d1871f86c /net/ipv4/esp4.c | |
parent | 5d22d47b9ed96eddb35821dc2cc4f629f45827f7 (diff) | |
parent | 415a13296a1a49639cabf9d2fe92267810caa47a (diff) | |
download | linux-56455e0998dd3a8096eb3fdc2c8e870a29a77bef.tar.bz2 |
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-03-29
1) Remove a redundant pointer initialization esp_input_set_header().
From Colin Ian King.
2) Mark the xfrm kmem_caches as __ro_after_init.
From Alexey Dobriyan.
3) Do the checksum for an ipsec offlad packet in software
if the device does not advertise NETIF_F_HW_ESP_TX_CSUM.
From Shannon Nelson.
4) Use booleans for true and false instead of integers
in xfrm_policy_cache_flush().
From Gustavo A. R. Silva
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 296d0b956bfe..97689012b357 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -654,7 +654,7 @@ static void esp_input_restore_header(struct sk_buff *skb) static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi) { struct xfrm_state *x = xfrm_input_state(skb); - struct ip_esp_hdr *esph = (struct ip_esp_hdr *)skb->data; + struct ip_esp_hdr *esph; /* For ESN we move the header forward by 4 bytes to * accomodate the high bits. We will move it back after |