Commit 56455e09 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 5d22d47b 415a1329

net/ipv4/esp4.c

+1 −1
Original line number Diff line number Diff line
@@ -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

net/ipv4/esp4_offload.c

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ static struct sk_buff *esp4_gso_segment(struct sk_buff *skb, 
	if (!(features & NETIF_F_HW_ESP) || !x->xso.offload_handle ||

	    (x->xso.dev != skb->dev))

		esp_features = features & ~(NETIF_F_SG | NETIF_F_CSUM_MASK);

	else if (!(features & NETIF_F_HW_ESP_TX_CSUM))

		esp_features = features & ~NETIF_F_CSUM_MASK;



	xo->flags |= XFRM_GSO_SEGMENT;

net/ipv6/esp6_offload.c

+2 −0
Original line number Diff line number Diff line
@@ -165,6 +165,8 @@ static struct sk_buff *esp6_gso_segment(struct sk_buff *skb, 
	if (!(features & NETIF_F_HW_ESP) || !x->xso.offload_handle ||

	    (x->xso.dev != skb->dev))

		esp_features = features & ~(NETIF_F_SG | NETIF_F_CSUM_MASK);

	else if (!(features & NETIF_F_HW_ESP_TX_CSUM))

		esp_features = features & ~NETIF_F_CSUM_MASK;



	xo->flags |= XFRM_GSO_SEGMENT;

net/xfrm/xfrm_input.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <linux/bottom_half.h>

#include <linux/cache.h>

#include <linux/interrupt.h>

#include <linux/slab.h>

#include <linux/module.h>
@@ -31,7 +32,7 @@ struct xfrm_trans_cb { 


#define XFRM_TRANS_SKB_CB(__skb) ((struct xfrm_trans_cb *)&((__skb)->cb[0]))



static struct kmem_cache *secpath_cachep __read_mostly;

static struct kmem_cache *secpath_cachep __ro_after_init;



static DEFINE_SPINLOCK(xfrm_input_afinfo_lock);

static struct xfrm_input_afinfo const __rcu *xfrm_input_afinfo[AF_INET6 + 1];

net/xfrm/xfrm_policy.c

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static DEFINE_SPINLOCK(xfrm_policy_afinfo_lock); 
static struct xfrm_policy_afinfo const __rcu *xfrm_policy_afinfo[AF_INET6 + 1]

						__read_mostly;



static struct kmem_cache *xfrm_dst_cache __read_mostly;

static struct kmem_cache *xfrm_dst_cache __ro_after_init;

static __read_mostly seqcount_t xfrm_policy_hash_generation;



static void xfrm_init_pmtu(struct xfrm_dst **bundle, int nr);
@@ -1743,7 +1743,7 @@ static void xfrm_pcpu_work_fn(struct work_struct *work) 
void xfrm_policy_cache_flush(void)

{

	struct xfrm_dst *old;

	bool found = 0;

	bool found = false;

	int cpu;



	might_sleep();

CRA Git | Maintained and supported by SUSTech CRA and CCSE