summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2020-09-16 15:46:59 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2020-09-16 15:46:59 -0400
commit8bcb303a18b7cacbb897a5d3d2b65848a6b12459 (patch)
tree1b8f57ea5e98966b6be923d0dc5c164a59065215
parent7630376c44f3a967236fba787c9e8fdcfe7a3aa5 (diff)
downloadlongterm-queue-5.2-8bcb303a18b7cacbb897a5d3d2b65848a6b12459.tar.gz
net: stmmac: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/net-stmmac-dwmac1000-provide-multicast-filter-fallba.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/queue/net-stmmac-dwmac1000-provide-multicast-filter-fallba.patch b/queue/net-stmmac-dwmac1000-provide-multicast-filter-fallba.patch
index d295556b..94f34c05 100644
--- a/queue/net-stmmac-dwmac1000-provide-multicast-filter-fallba.patch
+++ b/queue/net-stmmac-dwmac1000-provide-multicast-filter-fallba.patch
@@ -1,4 +1,4 @@
-From 592d751c1e174df5ff219946908b005eb48934b3 Mon Sep 17 00:00:00 2001
+From 29225bac60e5cab9f78b04793b706f0777cdf2cb Mon Sep 17 00:00:00 2001
From: Jonathan McDowell <noodles@earth.li>
Date: Wed, 12 Aug 2020 20:37:01 +0100
Subject: [PATCH] net: stmmac: dwmac1000: provide multicast filter fallback
@@ -15,11 +15,11 @@ Signed-off-by: Jonathan McDowell <noodles@earth.li>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
-index efc6ec1b8027..fc8759f146c7 100644
+index 81af0f3f5cf9..054e79a36b5a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
-@@ -164,6 +164,9 @@ static void dwmac1000_set_filter(struct mac_device_info *hw,
- value = GMAC_FRAME_FILTER_PR | GMAC_FRAME_FILTER_PCF;
+@@ -166,6 +166,9 @@ static void dwmac1000_set_filter(struct mac_device_info *hw,
+ value = GMAC_FRAME_FILTER_PR;
} else if (dev->flags & IFF_ALLMULTI) {
value = GMAC_FRAME_FILTER_PM; /* pass all multi */
+ } else if (!netdev_mc_empty(dev) && (mcbitslog2 == 0)) {