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

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>

1 files changed, 0 insertions, 10 deletions

diff --git a/include/net/esp.h b/include/net/esp.h
index 1356dda00d22..c92213c38312 100644
--- a/include/net/esp.h
+++ b/include/net/esp.h
@@ -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;