diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-11-02 02:13:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-02 02:13:48 -0400 |
| commit | 296c10639a33941d0090afa17b7535fcbf81d97a (patch) | |
| tree | f85819ef71b07bcf004c7971fa66c9f68a45bd74 /include/net | |
| parent | bonding: bond_get_size() returns wrong size (diff) | |
| parent | net: esp{4,6}: get rid of struct esp_data (diff) | |
| download | linux-dev-296c10639a33941d0090afa17b7535fcbf81d97a.tar.xz linux-dev-296c10639a33941d0090afa17b7535fcbf81d97a.zip | |
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>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/esp.h | 10 |
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; |