From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1C6AC2D0DB for ; Fri, 24 Jan 2020 10:09:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ADBDA2077C for ; Fri, 24 Jan 2020 10:09:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860576; bh=aAPfmIu4MnO6QtFhkIZfM4zbOHuov0ywUJAGOE0jrkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Zy97DfzZJYZOwoox9HeU8CdNMI5YNYrHEPApyZCbYRc1siJUgqkjNijFQsWSIrdZW 2JPCtgBibnV2b0O8rKMecFWc8aUz/InReyEwYE1xKQKnDiXDr+TFayU3P8JFgeOK8d SHLrrf74ElA68k5+sRFuewOP/cmLK6ehmUEqOVL0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389641AbgAXKJf (ORCPT ); Fri, 24 Jan 2020 05:09:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:46508 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389250AbgAXKJc (ORCPT ); Fri, 24 Jan 2020 05:09:32 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 64459214DB; Fri, 24 Jan 2020 10:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860571; bh=aAPfmIu4MnO6QtFhkIZfM4zbOHuov0ywUJAGOE0jrkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T0v+fZ0lUTcFsaVit7Ij4OaQ4lOiXxyDGQgYlJNLqR5qiOtT8nFdaK2NvOaUBMjMA pRDqKI6KheTsFLix5MMLMFR1usnM1L2cKKXaMxEchTHcNNVLg6LyiFAgTlL3d9OZkl PdjESiL+KJsGyxQt+aDcJo3wwRjdGRacSuybCE78= 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.19 030/639] bridge: br_arp_nd_proxy: set icmp6_router if neigh has NTF_ROUTER Date: Fri, 24 Jan 2020 10:23:20 +0100 Message-Id: <20200124093051.161524782@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roopa Prabhu [ Upstream commit 7aca011f88eb57be1b17b0216247f4e32ac54e29 ] Fixes: ed842faeb2bd ("bridge: suppress nd pkts on BR_NEIGH_SUPPRESS ports") Signed-off-by: Roopa Prabhu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/bridge/br_arp_nd_proxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bridge/br_arp_nd_proxy.c b/net/bridge/br_arp_nd_proxy.c index 2cf7716254be6..d42e3904b4987 100644 --- a/net/bridge/br_arp_nd_proxy.c +++ b/net/bridge/br_arp_nd_proxy.c @@ -311,7 +311,7 @@ static void br_nd_send(struct net_bridge *br, struct net_bridge_port *p, /* Neighbor Advertisement */ memset(na, 0, sizeof(*na) + na_olen); na->icmph.icmp6_type = NDISC_NEIGHBOUR_ADVERTISEMENT; - na->icmph.icmp6_router = 0; /* XXX: should be 1 ? */ + na->icmph.icmp6_router = (n->flags & NTF_ROUTER) ? 1 : 0; na->icmph.icmp6_override = 1; na->icmph.icmp6_solicited = 1; na->target = ns->target; -- 2.20.1