From: stephen hemminger <shemminger@vyatta.com>
Date: Fri, 26 Oct 2012 06:24:34 +0000 (+0000)
Subject: vxlan: don't expire permanent entries
X-Git-Tag: MMI-PSA29.97-13-9~15600^2~22
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3c172868cbbe3eb138fd57bb346c77dffb22b182;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

vxlan: don't expire permanent entries

VXLAN confused flag versus bitmap on state.
Based on part of a earlier patch by David Stevens.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 607976c00162..7b4adde93c01 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -816,7 +816,7 @@ static void vxlan_cleanup(unsigned long arg)
 				= container_of(p, struct vxlan_fdb, hlist);
 			unsigned long timeout;
 
-			if (f->state == NUD_PERMANENT)
+			if (f->state & NUD_PERMANENT)
 				continue;
 
 			timeout = f->used + vxlan->age_interval * HZ;