From: Roopa Prabhu <roopa@cumulusnetworks.com>
Date: Sat, 11 Feb 2017 05:38:36 +0000 (-0800)
Subject: vxlan: remove vni zero check and drop for COLLECT_METADATA
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=98eb253cbde7e860fad83fa759058269ca69916d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

vxlan: remove vni zero check and drop for COLLECT_METADATA

This patch drops the vni zero check for COLLECT_METADATA mode.
It is not really needed, vni zero is a valid vni.

Fixes: 3ad7a4b141eb ("vxlan: support fdb and learning in COLLECT_METADATA mode"
Reported-by: Joe Stringer <joe@ovn.org>
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 2374a75dcb55..4e27c5b09600 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1333,9 +1333,6 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
 
 	vni = vxlan_vni(vxlan_hdr(skb)->vx_vni);
 
-	if ((vs->flags & VXLAN_F_COLLECT_METADATA) && !vni)
-		goto drop;
-
 	vxlan = vxlan_vs_find_vni(vs, vni);
 	if (!vxlan)
 		goto drop;