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 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoe...
[pandora-kernel.git]
/
net
/
ipv6
/
xfrm6_output.c
diff --git
a/net/ipv6/xfrm6_output.c
b/net/ipv6/xfrm6_output.c
index
79ccfb0
..
5ee5a03
100644
(file)
--- a/
net/ipv6/xfrm6_output.c
+++ b/
net/ipv6/xfrm6_output.c
@@
-62,7
+62,7
@@
int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb)
{
int err;
- err = x
->inner_mode->afinfo->
extract_output(x, skb);
+ err = x
frm_inner_
extract_output(x, skb);
if (err)
return err;
@@
-72,6
+72,7
@@
int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb)
#endif
skb->protocol = htons(ETH_P_IPV6);
+ skb->local_df = 1;
return x->outer_mode->output2(x, skb);
}