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

[platform/kernel/linux-starfive.git] / drivers / net / dsa / sja1105 / sja1105_main.c

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index a9777eb..4f05456 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -1818,6 +1818,12 @@ static int sja1105_reload_cbs(struct sja1105_private *priv)
 {
        int rc = 0, i;
 
+       /* The credit based shapers are only allocated if
+        * CONFIG_NET_SCH_CBS is enabled.
+        */
+       if (!priv->cbs)
+               return 0;
+
        for (i = 0; i < priv->info->num_cbs_shapers; i++) {
                struct sja1105_cbs_entry *cbs = &priv->cbs[i];