1 files changed, 9 insertions, 3 deletions

diff --git a/net/dsa/port.c b/net/dsa/port.c
index e9b5b50f8cf1..c011dff523d0 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -291,7 +291,10 @@ int dsa_port_vlan_add(struct dsa_port *dp,
                 .vlan = vlan,
         };
 
-        if (br_vlan_enabled(dp->bridge_dev))
+        /* Can be called from dsa_slave_port_obj_add() or
+         * dsa_slave_vlan_rx_add_vid()
+         */
+        if (!dp->bridge_dev || br_vlan_enabled(dp->bridge_dev))
                 return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info);
 
         return 0;
@@ -306,10 +309,13 @@ int dsa_port_vlan_del(struct dsa_port *dp,
                 .vlan = vlan,
         };
 
-        if (netif_is_bridge_master(vlan->obj.orig_dev))
+        if (vlan->obj.orig_dev && netif_is_bridge_master(vlan->obj.orig_dev))
                 return -EOPNOTSUPP;
 
-        if (br_vlan_enabled(dp->bridge_dev))
+        /* Can be called from dsa_slave_port_obj_del() or
+         * dsa_slave_vlan_rx_kill_vid()
+         */
+        if (!dp->bridge_dev || br_vlan_enabled(dp->bridge_dev))
                 return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);
 
         return 0;