git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
net
/
ipv6
/
ipcomp6.c
diff --git
a/net/ipv6/ipcomp6.c
b/net/ipv6/ipcomp6.c
index
0cfcea4
..
4545e43
100644
(file)
--- a/
net/ipv6/ipcomp6.c
+++ b/
net/ipv6/ipcomp6.c
@@
-134,9
+134,7
@@
out:
static int ipcomp6_init_state(struct xfrm_state *x)
{
- int err;
- struct ipcomp_data *ipcd;
- struct xfrm_algo_desc *calg_desc;
+ int err = -EINVAL;
x->props.header_len = 0;
switch (x->props.mode) {