Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git...

[linux-2.6] / net / ipv4 / ah4.c

diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 0e98f2235b6e1edc5f35504e23e76ab5bad27aed..514c85b2631a3332187141c2afdd7ed7825314cb 100644 (file)
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -200,7 +200,7 @@ static void ah4_err(struct sk_buff *skb, u32 info)
        xfrm_state_put(x);
 }
 
-static int ah_init_state(struct xfrm_state *x, void *args)
+static int ah_init_state(struct xfrm_state *x)
 {
        struct ah_data *ahp = NULL;
        struct xfrm_algo_desc *aalg_desc;