diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 15:58:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 15:58:58 -0700 |
commit | fb395884576684ebb54b19b1054f4caed589d5f0 (patch) | |
tree | c941073819d504fb967e4d107e382ec92f51ecf0 /net/ipv4/ah4.c | |
parent | 91b90475e793e84a57d956af8c52645e292badcb (diff) | |
parent | 246955fe4c38bd706ae30e37c64892c94213775d (diff) | |
download | blackbird-op-linux-fb395884576684ebb54b19b1054f4caed589d5f0.tar.gz blackbird-op-linux-fb395884576684ebb54b19b1054f4caed589d5f0.zip |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/ah4.c')
-rw-r--r-- | net/ipv4/ah4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c index 0e98f2235b6e..514c85b2631a 100644 --- 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; |