Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 7 insertions, 7 deletions

diff --git a/include/net/esp.h b/include/net/esp.h
index d05d8d2c78f4..c1bc529809da 100644
--- a/include/net/esp.h
+++ b/include/net/esp.h
@@ -13,8 +13,6 @@ struct esp_data
 
         /* Confidentiality */
         struct {
-                u8                      *key;           /* Key */
-                int                     key_len;        /* Key length */
                 int                     padlen;         /* 0..255 */
                 /* ivlen is offset from enc_data, where encrypted data start.
                  * It is logically different of crypto_tfm_alg_ivsize(tfm).
@@ -28,14 +26,9 @@ struct esp_data
 
         /* Integrity. It is active when icv_full_len != 0 */
         struct {
-                u8                      *key;           /* Key */
-                int                     key_len;        /* Length of the key */
                 u8                      *work_icv;
                 int                     icv_full_len;
                 int                     icv_trunc_len;
-                void                    (*icv)(struct esp_data*,
-                                               struct sk_buff *skb,
-                                               int offset, int len, u8 *icv);
                 struct crypto_hash      *tfm;
         } auth;
 };
@@ -60,4 +53,11 @@ static inline int esp_mac_digest(struct esp_data *esp, struct sk_buff *skb,
         return crypto_hash_final(&desc, esp->auth.work_icv);
 }
 
+struct ip_esp_hdr;
+
+static inline struct ip_esp_hdr *ip_esp_hdr(const struct sk_buff *skb)
+{
+        return (struct ip_esp_hdr *)skb_transport_header(skb);
+}
+
 #endif