xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Browse Source 
Conflicts:
	net/xfrm/xfrm_policy.c

Minor merge conflict in xfrm_policy.c, consisting of overlapping
changes which were trivial to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2013-11-02 02:13:48 -04:00
parent e139862eee 1c5ad13f7c
commit 296c10639a
5 changed files with 41 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/net/esp.h
View File

@@ -3,16 +3,6 @@
#include <linux/skbuff.h>
struct crypto_aead;
struct esp_data {
/* 0..255 */
int padlen;
/* Confidentiality & Integrity */
struct crypto_aead *aead;
};
void *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len);
struct ip_esp_hdr;