diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /net/ipv4/ipcomp.c | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/ipv4/ipcomp.c')
| -rw-r--r-- | net/ipv4/ipcomp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index a42b64d040c4..38ccb6dfb02e 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c | |||
| @@ -104,9 +104,7 @@ out: | |||
| 104 | 104 | ||
| 105 | static int ipcomp4_init_state(struct xfrm_state *x) | 105 | static int ipcomp4_init_state(struct xfrm_state *x) |
| 106 | { | 106 | { |
| 107 | int err; | 107 | int err = -EINVAL; |
| 108 | struct ipcomp_data *ipcd; | ||
| 109 | struct xfrm_algo_desc *calg_desc; | ||
| 110 | 108 | ||
| 111 | x->props.header_len = 0; | 109 | x->props.header_len = 0; |
| 112 | switch (x->props.mode) { | 110 | switch (x->props.mode) { |