Skip to contentSkip to conversation

stmmac: platform: fix default values of the filter bins setting

PATCH Applied Huacai Chen 3 participants 3 messages Nov 26, 2014

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 stmmac: platform: fix default values of the filter bins setting

The commit 3b57de958e2a brought the support for a different amount of the filter bins, but didn't update the platform driver that without CONFIG_OF.

Fixes 3b57de958e2a (net: stmmac: Support devicetree configs for mcast

and ucast filter entries)

---
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +7 -6
index db56fa7..5b0da39 100644
@@ -177,12 +177,6 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
 	 */
 	plat->maxmtu = JUMBO_LEN;
 
-	/* Set default value for multicast hash bins */
-	plat->multicast_filter_bins = HASH_TABLE_SIZE;
-
-	/* Set default value for unicast filter entries */
-	plat->unicast_filter_entries = 1;
-
 	/*
 	 * Currently only the properties needed on SPEAr600
 	 * are provided. All other properties should be added
@@ -270,6 +264,13 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
 		return PTR_ERR(addr);
 
 	plat_dat = dev_get_platdata(&pdev->dev);
+
+	/* Set default value for multicast hash bins */
+	plat_dat->multicast_filter_bins = HASH_TABLE_SIZE;
+
+	/* Set default value for unicast filter entries */
+	plat_dat->unicast_filter_entries = 1;
+
 	if (pdev->dev.of_node) {
 		if (!plat_dat)
 			plat_dat = devm_kzalloc(&pdev->dev,
Signature · 1 line
1.7.7.3
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Huacai Chen

The commit 3b57de958e2a brought the support for a different amount of the filter bins, but didn't update the platform driver that without CONFIG_OF.

Fixes 3b57de958e2a (net: stmmac: Support devicetree configs for mcast

and ucast filter entries)

Quoted 36 lines
---
  .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |   13 +++++++------
  1 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +7 -6
index db56fa7..5b0da39 100644
@@ -177,12 +177,6 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
  	 */
  	plat->maxmtu = JUMBO_LEN;
 
-	/* Set default value for multicast hash bins */
-	plat->multicast_filter_bins = HASH_TABLE_SIZE;
-
-	/* Set default value for unicast filter entries */
-	plat->unicast_filter_entries = 1;
-
  	/*
  	 * Currently only the properties needed on SPEAr600
  	 * are provided. All other properties should be added
@@ -270,6 +264,13 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
  		return PTR_ERR(addr);
 
  	plat_dat = dev_get_platdata(&pdev->dev);
+
+	/* Set default value for multicast hash bins */
+	plat_dat->multicast_filter_bins = HASH_TABLE_SIZE;
+
+	/* Set default value for unicast filter entries */
+	plat_dat->unicast_filter_entries = 1;
+
  	if (pdev->dev.of_node) {
  		if (!plat_dat)
  			plat_dat = devm_kzalloc(&pdev->dev,
maintainer Applied
#2 lore raw
In reply to Huacai Chen

From: Huacai Chen <[email protected]>
Date: Wed, 26 Nov 2014 10:38:06 +0800

Quoted 8 lines

The commit 3b57de958e2a brought the support for a different amount of the filter bins, but didn't update the platform driver that without CONFIG_OF.

Fixes 3b57de958e2a (net: stmmac: Support devicetree configs for mcast

and ucast filter entries)

Applied, thanks.