Message ID | 20200319123929.085773750@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=1QoN=5E=vger.kernel.org=stable-owner@kernel.org> 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 4220DC4332E for <stable@archiver.kernel.org>; Thu, 19 Mar 2020 13:05:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1AED020732 for <stable@archiver.kernel.org>; Thu, 19 Mar 2020 13:05:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623118; bh=RY7e7j606L71J5x/NwXaYVjElJWCPEpcje+RnIAraiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2IKjTSp6sQREeTmWqlBV1ERq08yE8x993uRw3sB4cIqlKlQuhSmTJ16H2A45eFkBa pc3mIi0xe+GFJXqlVPCGZsvmubSlytiqay9/W8vr0v6u61Yo9LiDGOV4nC3brG96nq Q6eLVlE7MHLoDPivTYZ3WiIJU/EKyTlB+CWHWnCQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727320AbgCSNFR (ORCPT <rfc822;stable@archiver.kernel.org>); Thu, 19 Mar 2020 09:05:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:47952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726864AbgCSNFR (ORCPT <rfc822;stable@vger.kernel.org>); Thu, 19 Mar 2020 09:05:17 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 3B06220722; Thu, 19 Mar 2020 13:05:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623116; bh=RY7e7j606L71J5x/NwXaYVjElJWCPEpcje+RnIAraiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bcujtuU2sOpGDKdC3HQpwBjC9i+plm+V1wogUPaDCn9NHhx7f9meDr4dCDmPdA+ZS UKu4CtTt1HdocFlZoesPeK9T56IwOIMfaPVKI6WW63nc0hsRaykK7N3vPQt/RYrGId WyeaairrYczViivvCLKaOrsjc773Z+RV96Gpm0oE= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Per Sundstrom <per.sundstrom@redqube.se>, Jiri Wiesner <jwiesner@suse.com>, Eric Dumazet <edumazet@google.com>, Mahesh Bandewar <maheshb@google.com>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 4.4 13/93] ipvlan: do not add hardware address of master to its unicast filter list Date: Thu, 19 Mar 2020 13:59:17 +0100 Message-Id: <20200319123929.085773750@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123924.795019515@linuxfoundation.org> References: <20200319123924.795019515@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -145,7 +145,6 @@ static void ipvlan_uninit(struct net_dev static int ipvlan_open(struct net_device *dev) { struct ipvl_dev *ipvlan = netdev_priv(dev); - struct net_device *phy_dev = ipvlan->phy_dev; struct ipvl_addr *addr; if (ipvlan->port->mode == IPVLAN_MODE_L3) @@ -156,7 +155,7 @@ static int ipvlan_open(struct net_device list_for_each_entry(addr, &ipvlan->addrs, anode) ipvlan_ht_addr_add(ipvlan, addr); - return dev_uc_add(phy_dev, phy_dev->dev_addr); + return 0; } static int ipvlan_stop(struct net_device *dev) @@ -168,8 +167,6 @@ static int ipvlan_stop(struct net_device dev_uc_unsync(phy_dev, dev); dev_mc_unsync(phy_dev, dev); - dev_uc_del(phy_dev, phy_dev->dev_addr); - list_for_each_entry(addr, &ipvlan->addrs, anode) ipvlan_ht_addr_del(addr);