Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[powerpc.git] / include / net / esp.h

diff --git a/include/net/esp.h b/include/net/esp.h
index 064366d..d05d8d2 100644 (file)
--- a/include/net/esp.h
+++ b/include/net/esp.h
@@ -15,13 +15,14 @@ struct esp_data
        struct {
                u8                      *key;           /* Key */
                int                     key_len;        /* Key length */
-               u8                      *ivec;          /* ivec buffer */
+               int                     padlen;         /* 0..255 */
                /* ivlen is offset from enc_data, where encrypted data start.
                 * It is logically different of crypto_tfm_alg_ivsize(tfm).
                 * We assume that it is either zero (no ivec), or
                 * >= crypto_tfm_alg_ivsize(tfm). */
                int                     ivlen;
-               int                     padlen;         /* 0..255 */
+               int                     ivinitted;
+               u8                      *ivec;          /* ivec buffer */
                struct crypto_blkcipher *tfm;           /* crypto handle */
        } conf;
 
@@ -39,8 +40,6 @@ struct esp_data
        } auth;
 };
 
-extern int skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len);
-extern int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer);
 extern void *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len);
 
 static inline int esp_mac_digest(struct esp_data *esp, struct sk_buff *skb,