diff --git a/[refs] b/[refs]
index fedbbd227201..faba49acc8b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4afe2156eb639e563d6ef0c2706b66ea400348b2
+refs/heads/master: eb064c3b49931dc73bba59887019c7f5cb97d322
diff --git a/trunk/drivers/net/vxlan.c b/trunk/drivers/net/vxlan.c
index dda997a0102c..57325f356d4f 100644
--- a/trunk/drivers/net/vxlan.c
+++ b/trunk/drivers/net/vxlan.c
@@ -579,7 +579,7 @@ static bool vxlan_snoop(struct net_device *dev,
 			return false;
 
 		/* Don't migrate static entries, drop packets */
-		if (!(f->flags & NTF_SELF))
+		if (f->state & NUD_NOARP)
 			return true;
 
 		if (net_ratelimit())