These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / net / dsa.h

diff --git a/kernel/include/net/dsa.h b/kernel/include/net/dsa.h
index fbca63b..82a4c60 100644 (file)
--- a/kernel/include/net/dsa.h
+++ b/kernel/include/net/dsa.h
@@ -171,6 +171,11 @@ static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p)
        return !!(ds->index == ds->dst->cpu_switch && p == ds->dst->cpu_port);
 }
 
+static inline bool dsa_is_dsa_port(struct dsa_switch *ds, int p)
+{
+       return !!((ds->dsa_port_mask) & (1 << p));
+}
+
 static inline bool dsa_is_port_initialized(struct dsa_switch *ds, int p)
 {
        return ds->phys_port_mask & (1 << p) && ds->ports[p];
@@ -192,6 +197,11 @@ static inline u8 dsa_upstream_port(struct dsa_switch *ds)
                return ds->pd->rtable[dst->cpu_switch];
 }
 
+struct switchdev_trans;
+struct switchdev_obj;
+struct switchdev_obj_port_fdb;
+struct switchdev_obj_port_vlan;
+
 struct dsa_switch_driver {
        struct list_head        list;
 
@@ -296,12 +306,36 @@ struct dsa_switch_driver {
                                     u32 br_port_mask);
        int     (*port_stp_update)(struct dsa_switch *ds, int port,
                                   u8 state);
-       int     (*fdb_add)(struct dsa_switch *ds, int port,
-                          const unsigned char *addr, u16 vid);
-       int     (*fdb_del)(struct dsa_switch *ds, int port,
-                          const unsigned char *addr, u16 vid);
-       int     (*fdb_getnext)(struct dsa_switch *ds, int port,
-                              unsigned char *addr, bool *is_static);
+
+       /*
+        * VLAN support
+        */
+       int     (*port_vlan_prepare)(struct dsa_switch *ds, int port,
+                                    const struct switchdev_obj_port_vlan *vlan,
+                                    struct switchdev_trans *trans);
+       int     (*port_vlan_add)(struct dsa_switch *ds, int port,
+                                const struct switchdev_obj_port_vlan *vlan,
+                                struct switchdev_trans *trans);
+       int     (*port_vlan_del)(struct dsa_switch *ds, int port,
+                                const struct switchdev_obj_port_vlan *vlan);
+       int     (*port_pvid_get)(struct dsa_switch *ds, int port, u16 *pvid);
+       int     (*vlan_getnext)(struct dsa_switch *ds, u16 *vid,
+                               unsigned long *ports, unsigned long *untagged);
+
+       /*
+        * Forwarding database
+        */
+       int     (*port_fdb_prepare)(struct dsa_switch *ds, int port,
+                                   const struct switchdev_obj_port_fdb *fdb,
+                                   struct switchdev_trans *trans);
+       int     (*port_fdb_add)(struct dsa_switch *ds, int port,
+                               const struct switchdev_obj_port_fdb *fdb,
+                               struct switchdev_trans *trans);
+       int     (*port_fdb_del)(struct dsa_switch *ds, int port,
+                               const struct switchdev_obj_port_fdb *fdb);
+       int     (*port_fdb_dump)(struct dsa_switch *ds, int port,
+                                struct switchdev_obj_port_fdb *fdb,
+                                int (*cb)(struct switchdev_obj *obj));
 };
 
 void register_switch_driver(struct dsa_switch_driver *type);