diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 11:32:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 11:32:25 -0400 |
| commit | 4f31f3080943c7e3541f07df326f06d598a067d0 (patch) | |
| tree | e7455c1a8a3991d1e16690a8cf2f7d4f0dd55836 /net/ipv4/ipcomp.c | |
| parent | 1486361777b3ce5ead414d9b2d9fc46f9cd86e0b (diff) | |
| parent | 281c7413ed914623d3245299a4761b6b27ab9fdb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net: missing bits of net-namespace / sysctl
ipcomp: Fix warnings after ipcomp consolidation.
dccp: Add check for truncated ICMPv6 DCCP error packets
dccp: Fix incorrect length check for ICMPv4 packets
dccp: Add check for sequence number in ICMPv6 message
dccp: Fix sequence number check for ICMPv4 packets
dccp: Bug-Fix - AWL was never updated
dccp: Allow to distinguish original and retransmitted packets
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) { |