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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 B1E8DCA9EB9 for ; Sat, 26 Oct 2019 13:16:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F2FE214DA for ; Sat, 26 Oct 2019 13:16:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572095786; bh=3LsTofZJFeV/FbQ/iHlTLgcU1JFfDIoVXRbXNihtrDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Tp1jQVIg23ifwIBSL9dyPzqHJ+x98xVuHblLngr/FDbI7V0UgelQz9KpTRKH8qjdb UO4WbVnRNdkbkuMYJs8t1rhfDnnto1/DyZK/TlK0GG3WDEDbso0BgknofyUhu65QF1 9tnACl3sangUQCnAGhzQIhi2CpsiQnaU3QVQcxvY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726708AbfJZNQZ (ORCPT ); Sat, 26 Oct 2019 09:16:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:37882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726655AbfJZNQW (ORCPT ); Sat, 26 Oct 2019 09:16:22 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EDF54222BE; Sat, 26 Oct 2019 13:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572095781; bh=3LsTofZJFeV/FbQ/iHlTLgcU1JFfDIoVXRbXNihtrDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oou+/3IHFsZ7BE9nO+pCYTcTcMms6lt9OjoQmfo7XvzbJ8LKciMKl66+EhGPl1/Et 1ZwlJL1Jg9Q1gW/4Xii7IG5RUrmU7IXwUIPupb9A+DdpFBlBLOibA3ERusaOL9FgmP XFfu8gBQnK5xI9sjpN1KpqZQGuCpjdFxIflZIgO4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jose Abreu , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 12/99] net: stmmac: gmac4+: Not all Unicast addresses may be available Date: Sat, 26 Oct 2019 09:14:33 -0400 Message-Id: <20191026131600.2507-12-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191026131600.2507-1-sashal@kernel.org> References: <20191026131600.2507-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 25683bab09a70542b9f8e3e28f79b3369e56701f ] Some setups may not have all Unicast addresses filters available. Check the number of available filters before trying to setup it. Fixes: 477286b53f55 ("stmmac: add GMAC4 core support") Signed-off-by: Jose Abreu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index fc9954e4a7729..feae3adc793c5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -453,7 +453,7 @@ static void dwmac4_set_filter(struct mac_device_info *hw, value |= GMAC_PACKET_FILTER_HPF; /* Handle multiple unicast addresses */ - if (netdev_uc_count(dev) > GMAC_MAX_PERFECT_ADDRESSES) { + if (netdev_uc_count(dev) > hw->unicast_filter_entries) { /* Switch to promiscuous mode if more than 128 addrs * are required */ -- 2.20.1