Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
	net/bridge/br_multicast.c
	net/ipv6/sit.c

The conflicts were minor:

1) sit.c changes overlap with change to ip_tunnel_xmit() signature.

2) br_multicast.c had an overlap between computing max_delay using
   msecs_to_jiffies and turning MLDV2_MRC() into an inline function
   with a name using lowercase instead of uppercase letters.

3) stmmac had two overlapping changes, one which conditionally allocated
   and hooked up a dma_cfg based upon the presence of the pbl OF property,
   and another one handling store-and-forward DMA made.  The latter of
   which should not go into the new of_find_property() basic block.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 12 insertions, 9 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 623ebc50fe6b..7a0072003f34 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -71,19 +71,22 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
                 plat->force_sf_dma_mode = 1;
         }
 
-        dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg), GFP_KERNEL);
-        if (!dma_cfg)
-                return -ENOMEM;
-
-        plat->dma_cfg = dma_cfg;
-        of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl);
-        dma_cfg->fixed_burst = of_property_read_bool(np, "snps,fixed-burst");
-        dma_cfg->mixed_burst = of_property_read_bool(np, "snps,mixed-burst");
+        if (of_find_property(np, "snps,pbl", NULL)) {
+                dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg),
+                                       GFP_KERNEL);
+                if (!dma_cfg)
+                        return -ENOMEM;
+                plat->dma_cfg = dma_cfg;
+                of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl);
+                dma_cfg->fixed_burst =
+                        of_property_read_bool(np, "snps,fixed-burst");
+                dma_cfg->mixed_burst =
+                        of_property_read_bool(np, "snps,mixed-burst");
+        }
         plat->force_thresh_dma_mode = of_property_read_bool(np, "snps,force_thresh_dma_mode");
         if (plat->force_thresh_dma_mode) {
                 plat->force_sf_dma_mode = 0;
                 pr_warn("force_sf_dma_mode is ignored if force_thresh_dma_mode is set.");
-        }
 
         return 0;
 }