diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-30 18:42:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-30 18:42:13 +0100 |
| commit | c4a4ddaefbef3c5135c3167bd5e067859d71e84c (patch) | |
| tree | 1c44a7de360774a272495593d2bb67853380da82 /net/ipv4/xfrm4_policy.c | |
| parent | 6fc16e58adf50c0f1e4478538983fb5ff6f453d4 (diff) | |
| parent | 8723b795aaa0c5f0b9db2099af575f5e089a63f1 (diff) | |
Merge tag 'asoc-fix-v3.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
A few of the Coverity fixes from Takashi, one of which (the wm_hubs one)
is particularly noticable.
Diffstat (limited to 'net/ipv4/xfrm4_policy.c')
| -rw-r--r-- | net/ipv4/xfrm4_policy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index 9a459be24af7..ccde54248c8c 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c @@ -107,6 +107,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) memset(fl4, 0, sizeof(struct flowi4)); fl4->flowi4_mark = skb->mark; + fl4->flowi4_oif = skb_dst(skb)->dev->ifindex; if (!ip_is_fragment(iph)) { switch (iph->protocol) { |