net: dsa: define port types

Introduce an enumerated type for ports, which will be way more explicit
to identify a port type instead of digging into switch port masks.

A port can be of type CPU, DSA, user, or unused by default. This is a
static parsed information that cannot be changed at runtime.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index dc772806239671f90bad4a06d3e2a7491e87a5ab..8da20c4a6552fdb96337c7630d2e77ff82e47e90 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -180,6 +180,13 @@ struct dsa_port {
        struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev,
                               struct packet_type *pt);
 
+       enum {
+               DSA_PORT_TYPE_UNUSED = 0,
+               DSA_PORT_TYPE_CPU,
+               DSA_PORT_TYPE_DSA,
+               DSA_PORT_TYPE_USER,
+       } type;
+
        struct dsa_switch       *ds;
        unsigned int            index;
        const char              *name;

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index d43c59c91058c84933f1811884c44e14cd1a3d73..dd6f35b929372ddbfd862d90cf463b8093f1ebe7 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -185,6 +185,7 @@ static int dsa_ds_complete(struct dsa_switch_tree *dst, struct dsa_switch *ds)
                        return err;
 
                ds->dsa_port_mask |= BIT(index);
+               port->type = DSA_PORT_TYPE_DSA;
        }
 
        return 0;
@@ -504,6 +505,7 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index,
         * net/dsa/dsa.c::dsa_switch_setup_one does.
         */
        ds->cpu_port_mask |= BIT(index);
+       port->type = DSA_PORT_TYPE_CPU;
 
        tag_protocol = ds->ops->get_tag_protocol(ds);
        tag_ops = dsa_resolve_tag_protocol(tag_protocol);
@@ -543,6 +545,7 @@ static int dsa_ds_parse(struct dsa_switch_tree *dst, struct dsa_switch *ds)
                         * net/dsa/dsa.c::dsa_switch_setup_one does.
                         */
                        ds->enabled_port_mask |= BIT(index);
+                       port->type = DSA_PORT_TYPE_USER;
                }
 
        }

diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c
index fa543c4a6061146cb2c7b8f210801c38a5cfa55b..9fd5b3adab1e7f2657f42028eed52fe498699b29 100644 (file)
--- a/net/dsa/legacy.c
+++ b/net/dsa/legacy.c
@@ -101,6 +101,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds,
        struct dsa_chip_data *cd = ds->cd;
        bool valid_name_found = false;
        int index = ds->index;
+       struct dsa_port *dp;
        int i, ret;
 
        /*
@@ -109,6 +110,8 @@ static int dsa_switch_setup_one(struct dsa_switch *ds,
        for (i = 0; i < ds->num_ports; i++) {
                char *name;
 
+               dp = &ds->ports[i];
+
                name = cd->port_names[i];
                if (name == NULL)
                        continue;
@@ -122,10 +125,13 @@ static int dsa_switch_setup_one(struct dsa_switch *ds,
                        dst->cpu_dp = &ds->ports[i];
                        dst->cpu_dp->master = master;
                        ds->cpu_port_mask |= 1 << i;
+                       dp->type = DSA_PORT_TYPE_CPU;
                } else if (!strcmp(name, "dsa")) {
                        ds->dsa_port_mask |= 1 << i;
+                       dp->type = DSA_PORT_TYPE_DSA;
                } else {
                        ds->enabled_port_mask |= 1 << i;
+                       dp->type = DSA_PORT_TYPE_USER;
                }
                valid_name_found = true;
        }