Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2250306ybg; Sun, 27 Oct 2019 14:23:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqxlill7RAD6fchPDcETPklJVkmIX5un1nEulgduWTMzBtyKelRo4US+HJ/SbQdl/IL6H1tl X-Received: by 2002:a50:cbc2:: with SMTP id l2mr16379760edi.304.1572211383641; Sun, 27 Oct 2019 14:23:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211383; cv=none; d=google.com; s=arc-20160816; b=WwFZHiytg7WN/6Uv6OIwULCLbdR2Rec6NPGxcFOLoH4tWAd/s9YUrl1zZujD3dP/Wx gvu60nSOGE+yxOgoOTo3XlWBNMD3LY9V5TXuckpPt/4q59OP2slHVz4vvvSBzz7VJBbL LFxWGEwzs2efD5FDdN9nVkef6ngPHVKTQiwC1/RZltzksirtUs00YJ9JVOBf/2G87hZm uCnLvvY0a1VGZ5IUy0XnRLm0gfZW26/HH90zD9UZGYzsECysp5gb02ZbEcc0y7BxjzDt 4tjuCf2eDfLQULR7wKK2B2rAb/wK0HZ0iMIQi6O3QtnRDdMeFTdHs4GdvHlUkvgw3uTX fbKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=O5Gy8+oDSR7x3v9TSFzLiPzFXm5MXK+HMpN77v8dAIM=; b=v+Ql17OxVOiB4X97LfjXflYV5QR4jYTxqr3S9OQjrQbjOw+oPvW6z8qfGT+95jzhb+ SUxT1flPwPfVJJMmeq9yha4ypy3kEUpZ2Hb+OrUfb/K2q6tuwQSO1og4ImiQOVubkRgF wtjLWGUc2YJCA6Fl9uo5VmdpA047ZjRnK8i6DHGJyQbFA51pZyH1B66Nvjut9QLaFhDM jP2YiZ18PqiULTwv/ZqcQk4x1uxRc0/JWswyAmcXN5v4T0/syVk8VnhXhXC+0jJvH4mg GDWjdj/K/MsqC7tq8cRMW0Auk/D7x6GFAM8wR7GNAtWB/LKM/xzxbm81nguYEYC9/7VW C3uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iSjF2WIk; 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 x50si6138305eda.155.2019.10.27.14.22.40; Sun, 27 Oct 2019 14:23:03 -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; dkim=pass header.i=@kernel.org header.s=default header.b=iSjF2WIk; 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 S1731887AbfJ0VVO (ORCPT + 99 others); Sun, 27 Oct 2019 17:21:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:41976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731870AbfJ0VVL (ORCPT ); Sun, 27 Oct 2019 17:21:11 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 180E8208C0; Sun, 27 Oct 2019 21:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211270; bh=BTbYBLePp+9uCeyYrl7wI5G+3XjBonWbTYXj63iJmqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iSjF2WIk4EvhgXXnQNYK817hohz0hP84BWlOFukdrDEMDJm2cpjw6upgMjFchIXG1 eDbg4/D28H7nQOXmbpS/+5FbsrxpmSRGlWna3ROWQ6B0sF053C0dAE5X+asbw82xS2 XKXndFCphyiUclVoyGK8gd9ifWtdcCkHWrb0Vrkc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jose Abreu , "David S. Miller" , Sasha Levin Subject: [PATCH 5.3 038/197] net: stmmac: xgmac: Not all Unicast addresses may be available Date: Sun, 27 Oct 2019 21:59:16 +0100 Message-Id: <20191027203353.777116238@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@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: Jose Abreu [ Upstream commit 9a2ae7b3960eb2426a8560cbc3251e3453230d21 ] Some setups may not have all Unicast addresses filters available. Let's check this before trying to setup filters. Fixes: 0efedbf11f07 ("net: stmmac: xgmac: Fix XGMAC selftests") Signed-off-by: Jose Abreu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c index 85c68b7ee8c6a..46d74f407aab6 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c @@ -370,7 +370,7 @@ static void dwxgmac2_set_filter(struct mac_device_info *hw, dwxgmac2_set_mchash(ioaddr, mc_filter, mcbitslog2); /* Handle multiple unicast addresses */ - if (netdev_uc_count(dev) > XGMAC_ADDR_MAX) { + if (netdev_uc_count(dev) > hw->unicast_filter_entries) { value |= XGMAC_FILTER_PR; } else { struct netdev_hw_addr *ha; -- 2.20.1