git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
ipv6
/
xfrm6_mode_tunnel.c
diff --git
a/net/ipv6/xfrm6_mode_tunnel.c
b/net/ipv6/xfrm6_mode_tunnel.c
index
8af79be
..
5e7d8a7
100644
(file)
--- a/
net/ipv6/xfrm6_mode_tunnel.c
+++ b/
net/ipv6/xfrm6_mode_tunnel.c
@@
-37,10
+37,9
@@
static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)
* its absence, that of the top IP header. The value of skb->data will always
* point to the top IP header.
*/
* its absence, that of the top IP header. The value of skb->data will always
* point to the top IP header.
*/
-static int xfrm6_tunnel_output(struct sk_buff *skb)
+static int xfrm6_tunnel_output(struct
xfrm_state *x, struct
sk_buff *skb)
{
struct dst_entry *dst = skb->dst;
{
struct dst_entry *dst = skb->dst;
- struct xfrm_state *x = dst->xfrm;
struct ipv6hdr *iph, *top_iph;
int dsfield;
struct ipv6hdr *iph, *top_iph;
int dsfield;