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

[linux-2.6-microblaze.git] / net / dsa / port.c

diff --git a/net/dsa/port.c b/net/dsa/port.c
index c226169..caeef4c 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -85,7 +85,7 @@ int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy)
        return 0;
 }
 
-void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy)
+void dsa_port_disable(struct dsa_port *dp)
 {
        struct dsa_switch *ds = dp->ds;
        int port = dp->index;
@@ -94,7 +94,7 @@ void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy)
                dsa_port_set_state_now(dp, BR_STATE_DISABLED);
 
        if (ds->ops->port_disable)
-               ds->ops->port_disable(ds, port, phy);
+               ds->ops->port_disable(ds, port);
 }
 
 int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br)
@@ -106,16 +106,23 @@ int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br)
        };
        int err;
 
-       /* Here the port is already bridged. Reflect the current configuration
-        * so that drivers can program their chips accordingly.
+       /* Set the flooding mode before joining the port in the switch */
+       err = dsa_port_bridge_flags(dp, BR_FLOOD | BR_MCAST_FLOOD, NULL);
+       if (err)
+               return err;
+
+       /* Here the interface is already bridged. Reflect the current
+        * configuration so that drivers can program their chips accordingly.
         */
        dp->bridge_dev = br;
 
        err = dsa_port_notify(dp, DSA_NOTIFIER_BRIDGE_JOIN, &info);
 
        /* The bridging is rolled back on error */
-       if (err)
+       if (err) {
+               dsa_port_bridge_flags(dp, 0, NULL);
                dp->bridge_dev = NULL;
+       }
 
        return err;
 }
@@ -138,6 +145,9 @@ void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br)
        if (err)
                pr_err("DSA: failed to notify DSA_NOTIFIER_BRIDGE_LEAVE\n");
 
+       /* Port is leaving the bridge, disable flooding */
+       dsa_port_bridge_flags(dp, 0, NULL);
+
        /* Port left the bridge, put in BR_STATE_DISABLED by the bridge layer,
         * so allow it to be in BR_STATE_FORWARDING to be kept functional
         */
@@ -178,6 +188,35 @@ int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock,
        return dsa_port_notify(dp, DSA_NOTIFIER_AGEING_TIME, &info);
 }
 
+int dsa_port_pre_bridge_flags(const struct dsa_port *dp, unsigned long flags,
+                             struct switchdev_trans *trans)
+{
+       struct dsa_switch *ds = dp->ds;
+
+       if (!ds->ops->port_egress_floods ||
+           (flags & ~(BR_FLOOD | BR_MCAST_FLOOD)))
+               return -EINVAL;
+
+       return 0;
+}
+
+int dsa_port_bridge_flags(const struct dsa_port *dp, unsigned long flags,
+                         struct switchdev_trans *trans)
+{
+       struct dsa_switch *ds = dp->ds;
+       int port = dp->index;
+       int err = 0;
+
+       if (switchdev_trans_ph_prepare(trans))
+               return 0;
+
+       if (ds->ops->port_egress_floods)
+               err = ds->ops->port_egress_floods(ds, port, flags & BR_FLOOD,
+                                                 flags & BR_MCAST_FLOOD);
+
+       return err;
+}
+
 int dsa_port_fdb_add(struct dsa_port *dp, const unsigned char *addr,
                     u16 vid)
 {
@@ -253,7 +292,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;
@@ -268,10 +310,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;