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,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 78C6DCA9EAF for ; Sun, 27 Oct 2019 21:21:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 413DD20717 for ; Sun, 27 Oct 2019 21:21:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211272; bh=BTbYBLePp+9uCeyYrl7wI5G+3XjBonWbTYXj63iJmqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0RgOGUsM1O/a2q4NXEEt9vYxScZ9anHTzxJ8JbZd0Y5QPJpbCte+viOEtAhpFBXLs 9peQ3v9S/c65N7RHFpdheCiavhio3nGmzhFEiRk+tJ8jCf3M0gGEukdzMBdP7NvTNs 7sEWxZNgX8dmpxiBoPU9g1A7UazAL9HeRZ2+lydI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731875AbfJ0VVL (ORCPT ); Sun, 27 Oct 2019 17:21:11 -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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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