diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 18:58:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 18:58:58 -0400 |
| commit | fb395884576684ebb54b19b1054f4caed589d5f0 (patch) | |
| tree | c941073819d504fb967e4d107e382ec92f51ecf0 /net/ipv6/esp6.c | |
| parent | 91b90475e793e84a57d956af8c52645e292badcb (diff) | |
| parent | 246955fe4c38bd706ae30e37c64892c94213775d (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/esp6.c')
| -rw-r--r-- | net/ipv6/esp6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index be7095d6babe..324db62515a2 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
| @@ -296,7 +296,7 @@ static void esp6_destroy(struct xfrm_state *x) | |||
| 296 | kfree(esp); | 296 | kfree(esp); |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | static int esp6_init_state(struct xfrm_state *x, void *args) | 299 | static int esp6_init_state(struct xfrm_state *x) |
| 300 | { | 300 | { |
| 301 | struct esp_data *esp = NULL; | 301 | struct esp_data *esp = NULL; |
| 302 | 302 | ||