diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
| commit | 29516d75a0b09e0a0328dd55c98a342515c9615a (patch) | |
| tree | 4b03326311958ad6de82653a1caf289ad8c38538 /net/ipv6/ah6.c | |
| parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
| parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'net/ipv6/ah6.c')
| -rw-r--r-- | net/ipv6/ah6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index e3ecf626cbf7..986fdfdccbcd 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c | |||
| @@ -339,7 +339,7 @@ static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
| 339 | xfrm_state_put(x); | 339 | xfrm_state_put(x); |
| 340 | } | 340 | } |
| 341 | 341 | ||
| 342 | static int ah6_init_state(struct xfrm_state *x, void *args) | 342 | static int ah6_init_state(struct xfrm_state *x) |
| 343 | { | 343 | { |
| 344 | struct ah_data *ahp = NULL; | 344 | struct ah_data *ahp = NULL; |
| 345 | struct xfrm_algo_desc *aalg_desc; | 345 | struct xfrm_algo_desc *aalg_desc; |