Received: by 10.192.165.156 with SMTP id m28csp1159771imm; Wed, 11 Apr 2018 13:35:01 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+r38nIXeRNJBMcs4TQpkLYKM883/YiYrs6HvUASb7gh+YpRL6Pbo9XGQ2/CRsjbFe0D0Ci X-Received: by 2002:a17:902:51ce:: with SMTP id y72-v6mr6518254plh.157.1523478901875; Wed, 11 Apr 2018 13:35:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523478901; cv=none; d=google.com; s=arc-20160816; b=ENPiNa+LVrCM2pO5P/ti2BlFEdK2I9Ax8ILO2H7F3cwCDaKy0piu0dhcxdd+qeeor+ 3w3OmiHA0Q4tZgC0C4tE5iuutAL6RkcbrRutPJigGR8s2J74dA2CuqQcBFn9VraVpwuF 4RQYHrtDXJ4bfHvw8HjbQq+PKE28+QTmXhX2vBJ4J9ZIBglkxoB2CIub3vDPtXCAOTuB 5Br519l6YoUd2OQxRVIEb3eOT7SpaJeK7XnHBBDkp+mObaEfO92UAjOZDDa0po3lTgMq MufVmJ+6iLi2gOu5VrxgvuJjWzFMueVoXDFI86Dc/eP02TmC8qGkU2Gy3LlBGsVWvePS qD5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Vsvph3q9iQWnpN0yj2Z+Fz9i8oLlbPsnzjP6UxS7BM8=; b=q3rPoshxx8Gwj5olJxRmq+Uy4dzy588Kzi1CjZNEysJJnXEgiWLhoclZ+O/AwAlQig lCUSH+aKg4Aoeq6o9qs1yPwztTGLXpyqkcS6T2D0KG99LoPFUgi9ay7aUDIc3DNATqpx QrPXB+q3cLH5KrTVKiMBY+5imS5avUIUj23+xRNcCVFUNRUl8HL7EJLD4o2DyjNLb4BC GSxm3q7otYi0DALGaeTR/Y0HA5u5Oiiojo0C/PUdwEdtaslVLYTXo7DHilIFtRcSHWE2 pxiztTRqOIvyF874GeWwLoLnfn5UIFNXzTaf36EEuOBF+Q7uAAlD8xKo/vOJ2IqME9CG ts3A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s1-v6si1832108plj.710.2018.04.11.13.34.25; Wed, 11 Apr 2018 13:35:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757151AbeDKU3h (ORCPT + 99 others); Wed, 11 Apr 2018 16:29:37 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:60698 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932592AbeDKSuK (ORCPT ); Wed, 11 Apr 2018 14:50:10 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id D95FDD23; Wed, 11 Apr 2018 18:50:09 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Roopa Prabhu , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 148/190] vxlan: dont migrate permanent fdb entries during learn Date: Wed, 11 Apr 2018 20:36:34 +0200 Message-Id: <20180411183601.286565742@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183550.114495991@linuxfoundation.org> References: <20180411183550.114495991@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Roopa Prabhu [ Upstream commit e0090a9e979de5202c7d16c635dea2f005221073 ] This patch fixes vxlan_snoop to not move permanent fdb entries on learn events. This is consistent with the bridge fdb handling of permanent entries. Fixes: 26a41ae60438 ("vxlan: only migrate dynamic FDB entries") Signed-off-by: Roopa Prabhu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/vxlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -962,7 +962,7 @@ static bool vxlan_snoop(struct net_devic return false; /* Don't migrate static entries, drop packets */ - if (f->state & NUD_NOARP) + if (f->state & (NUD_PERMANENT | NUD_NOARP)) return true; if (net_ratelimit())