diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-02 17:21:25 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-02 17:21:25 +0300 |
| commit | f6d3125fa3c2f55ddf7cf69365c41089de6cfae6 (patch) | |
| tree | ff2bcb135ebf090d7b383d55123b621f4590632c /net/ipv4/route.c | |
| parent | 2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb (diff) | |
| parent | 36f8dafe52b0d0726edd5102900e37192f1d3c65 (diff) | |
| download | linux-f6d3125fa3c2f55ddf7cf69365c41089de6cfae6.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/dsa/slave.c
net/dsa/slave.c simply had overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 1441de1550e6..76ca4e75f785 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1743,6 +1743,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, fl4.flowi4_mark = skb->mark; fl4.flowi4_tos = tos; fl4.flowi4_scope = RT_SCOPE_UNIVERSE; + fl4.flowi4_flags = 0; fl4.daddr = daddr; fl4.saddr = saddr; err = fib_lookup(net, &fl4, &res, 0); |