diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-09-29 12:52:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-29 12:52:07 +0200 |
| commit | d8dfacf8b50c260d79864933ac82a8198a0908a9 (patch) | |
| tree | b172eb8643de7bd9f9439c58031b06c98116d86a /net/ipv4/udp.c | |
| parent | e87359efcaf45efc41dbaa6ec25eb26705300cee (diff) | |
| parent | df075feefbd347f13fba5198294cda619532c237 (diff) | |
Merge branch 'topic/firewire-update' into for-next
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index c0a15e7f359f..f7d1d5e19e95 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1024,7 +1024,8 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) if (netif_index_is_vrf(net, ipc.oif)) { flowi4_init_output(fl4, ipc.oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE, sk->sk_protocol, - (flow_flags | FLOWI_FLAG_VRFSRC), + (flow_flags | FLOWI_FLAG_VRFSRC | + FLOWI_FLAG_SKIP_NH_OIF), faddr, saddr, dport, inet->inet_sport); |