projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'keys/keys-next'
[deliverable/linux.git]
/
net
/
ipv4
/
xfrm4_policy.c
diff --git
a/net/ipv4/xfrm4_policy.c
b/net/ipv4/xfrm4_policy.c
index 41f5b504a782c392a20594325706c199136ecaa5..6a7ff69575353f5242aa800023999bcc12823fee 100644
(file)
--- a/
net/ipv4/xfrm4_policy.c
+++ b/
net/ipv4/xfrm4_policy.c
@@
-112,7
+112,7
@@
_decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
int oif = 0;
if (skb_dst(skb))
- oif =
l3mdev_fib_oif(skb_dst(skb)->dev)
;
+ oif =
skb_dst(skb)->dev->ifindex
;
memset(fl4, 0, sizeof(struct flowi4));
fl4->flowi4_mark = skb->mark;
This page took
0.02637 seconds
and
5
git commands to generate.