diff options
| author | J. German Rivera <Jose.G.Rivera@freescale.com> | 2013-09-04 23:19:35 (GMT) |
|---|---|---|
| committer | J. German Rivera <German.Rivera@freescale.com> | 2013-09-04 23:19:35 (GMT) |
| commit | 868610ea99600dd061204dd182eb02eb4fddc582 (patch) | |
| tree | b89b192fd42e70ab7b00e87d37b5194937323dee | |
| parent | bf4655fe7dad6a77a36acbc3d960a8156c04b044 (diff) | |
| parent | 70c2c840d8ff41359aafd7f510144c235a32fce1 (diff) | |
| download | linux-fsl-qoriq-868610ea99600dd061204dd182eb02eb4fddc582.tar.xz | |
Merge branch 'sdk-kernel-3.8'
| -rw-r--r-- | arch/powerpc/Makefile | 1 | ||||
| -rw-r--r-- | include/linux/fsl_dpa_stats.h | 2 | ||||
| -rw-r--r-- | net/xfrm/xfrm_output.c | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index deb9c61..1893fb9 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -91,6 +91,7 @@ CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mno-pointers-to-nested-functions) CFLAGS-$(CONFIG_PPC32) := -ffixed-r2 -mmultiple +CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,-mtune=power4) CFLAGS-$(CONFIG_CELL_CPU) += $(call cc-option,-mcpu=cell) CFLAGS-$(CONFIG_POWER4_CPU) += $(call cc-option,-mcpu=power4) CFLAGS-$(CONFIG_POWER5_CPU) += $(call cc-option,-mcpu=power5) diff --git a/include/linux/fsl_dpa_stats.h b/include/linux/fsl_dpa_stats.h index b8fe850..048efd8 100644 --- a/include/linux/fsl_dpa_stats.h +++ b/include/linux/fsl_dpa_stats.h @@ -46,7 +46,7 @@ #define DPA_STATS_MAX_NUM_OF_REQUESTS 256 /* Maximum number of single and class counters */ -#define DPA_STATS_MAX_NUM_OF_COUNTERS 128 +#define DPA_STATS_MAX_NUM_OF_COUNTERS 512 /* Maximum number of class counter members */ #define DPA_STATS_MAX_NUM_OF_CLASS_MEMBERS 256 diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 3476a27..73e1128 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c @@ -55,6 +55,9 @@ static int xfrm_output_one(struct sk_buff *skb, int err) } #ifdef CONFIG_AS_FASTPATH + if (!x->asf_sa_cookie && asf_cb_fns.ipsec_enc_hook) + asf_cb_fns.ipsec_enc_hook(NULL, x, NULL, skb->skb_iif); + if (x->asf_sa_cookie && asf_cb_fns.ipsec_encrypt_n_send) { err = -EINPROGRESS; if (!asf_cb_fns.ipsec_encrypt_n_send(skb, x)) |