projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-2.6'
[powerpc.git]
/
net
/
xfrm
/
xfrm_output.c
diff --git
a/net/xfrm/xfrm_output.c
b/net/xfrm/xfrm_output.c
index
0eb3377
..
f4bfd6c
100644
(file)
--- a/
net/xfrm/xfrm_output.c
+++ b/
net/xfrm/xfrm_output.c
@@
-63,7
+63,7
@@
int xfrm_output(struct sk_buff *skb)
xfrm_replay_notify(x, XFRM_REPLAY_UPDATE);
}
xfrm_replay_notify(x, XFRM_REPLAY_UPDATE);
}
- err = x->mode->output(x, skb);
+ err = x->
outer_
mode->output(x, skb);
if (err)
goto error;
if (err)
goto error;
@@
-82,7
+82,7
@@
int xfrm_output(struct sk_buff *skb)
}
dst = skb->dst;
x = dst->xfrm;
}
dst = skb->dst;
x = dst->xfrm;
- } while (x &&
(x->props.mode != XFRM_MODE
_TUNNEL));
+ } while (x &&
!(x->outer_mode->flags & XFRM_MODE_FLAG
_TUNNEL));
err = 0;
err = 0;