diff options
author | David S. Miller <davem@davemloft.net> | 2018-01-29 10:14:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-01-29 10:15:51 -0500 |
commit | 3e3ab9ccca5b50b11bd4d16c2048b667343354bd (patch) | |
tree | 7279f7401e7cc2b93fb7cb2bff894b5385429a68 /drivers/net/vrf.c | |
parent | 868c36dcc949c26bc74fa4661b670d9acc6489e4 (diff) | |
parent | ba804bb4b72e57374b5f567b783aa0298fba0ce6 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vrf.c')
-rw-r--r-- | drivers/net/vrf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index feb1b2e15c2e..139c61c8244a 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c | |||
@@ -673,8 +673,9 @@ static struct sk_buff *vrf_ip_out(struct net_device *vrf_dev, | |||
673 | struct sock *sk, | 673 | struct sock *sk, |
674 | struct sk_buff *skb) | 674 | struct sk_buff *skb) |
675 | { | 675 | { |
676 | /* don't divert multicast */ | 676 | /* don't divert multicast or local broadcast */ |
677 | if (ipv4_is_multicast(ip_hdr(skb)->daddr)) | 677 | if (ipv4_is_multicast(ip_hdr(skb)->daddr) || |
678 | ipv4_is_lbcast(ip_hdr(skb)->daddr)) | ||
678 | return skb; | 679 | return skb; |
679 | 680 | ||
680 | if (qdisc_tx_is_default(vrf_dev)) | 681 | if (qdisc_tx_is_default(vrf_dev)) |