diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-22 21:08:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-22 21:09:11 -0700 |
| commit | e55dddfe7e0deaa3282e0f346d6ed97c4e481388 (patch) | |
| tree | 70311be3e51976320ada27f2bef73c667ff76d90 /include | |
| parent | 1ae292a2457cd692828da2be87cb967260993ad0 (diff) | |
| parent | f027e0cc8255a8af8197835f2f44910dc63e2fa5 (diff) | |
| download | lwn-e55dddfe7e0deaa3282e0f346d6ed97c4e481388.tar.gz lwn-e55dddfe7e0deaa3282e0f346d6ed97c4e481388.zip | |
Merge branch 'dsa-fix-MV88E6131-tagging'
Andrew Lunn says:
====================
Fix MV88E6131 tagging
Marvell has two different tagging protocols for frames passed to a
swicth. There is the older DSA and the newer EDSA. Somewhere along the
way, we broke support for switches which only support DSA, by trying
to configure them to use EDSA. These patches add back support for
switches which only support DSA, by allowing the drivers to
dynamically indicate the tagging protocol they support to the DSA
core. This needs to be dynamic since the mv88e6xxx has to support two
protocols.
Thanks go to Jamie Lentin for reporting the problem, helping debug it,
providing some of the fix, and testing.
====================
Tested-By: Jamie Lentin <jm@lentin.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/dsa.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index d00c392bc9f8..8ca2684c5358 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -239,14 +239,15 @@ struct switchdev_obj_port_vlan; struct dsa_switch_driver { struct list_head list; - enum dsa_tag_protocol tag_protocol; - /* * Probing and setup. */ const char *(*probe)(struct device *dsa_dev, struct device *host_dev, int sw_addr, void **priv); + + enum dsa_tag_protocol (*get_tag_protocol)(struct dsa_switch *ds); + int (*setup)(struct dsa_switch *ds); int (*set_addr)(struct dsa_switch *ds, u8 *addr); u32 (*get_phy_flags)(struct dsa_switch *ds, int port); |