Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[safe/jmp/linux-2.6] / include / net / ah.h

diff --git a/include/net/ah.h b/include/net/ah.h
index 8f257c1..ae1c322 100644 (file)
--- a/include/net/ah.h
+++ b/include/net/ah.h
@@ -9,8 +9,6 @@
 
 struct ah_data
 {
-       u8                      *key;
-       int                     key_len;
        u8                      *work_icv;
        int                     icv_full_len;
        int                     icv_trunc_len;
@@ -40,4 +38,11 @@ out:
        return err;
 }
 
+struct ip_auth_hdr;
+
+static inline struct ip_auth_hdr *ip_auth_hdr(const struct sk_buff *skb)
+{
+       return (struct ip_auth_hdr *)skb_transport_header(skb);
+}
+
 #endif