The first patch ports tag_edsa.c's handling of IGMP/MLD traps to tag_dsa.c. That way, we start from two logically equivalent taggers that are then merged. The second commit does the heavy lifting of actually fusing tag_dsa.c and tag_edsa.c. The final one just follows up with some clean up of existing comments.
v2 -> v3: - Add the first patch described above as suggested by Andrew. - Better documentation of TO_SNIFFER and FORWARD tags. - Spelling. v1 -> v2: - Fixed some grammar and whitespace errors. - Removed unnecessary default value in Kconfig. - Removed unnecessary #ifdef. - Split out comment fixes from functional changes. - Fully document enum dsa_code. Tobias Waldekranz (3): net: dsa: tag_dsa: Allow forwarding of redirected IGMP traffic net: dsa: tag_dsa: Unify regular and ethertype DSA taggers net: dsa: tag_dsa: Use a consistent comment style net/dsa/Kconfig | 5 + net/dsa/Makefile | 3 +- net/dsa/tag_dsa.c | 329 ++++++++++++++++++++++++++++++++++++--------- net/dsa/tag_edsa.c | 202 ---------------------------- 4 files changed, 271 insertions(+), 268 deletions(-) delete mode 100644 net/dsa/tag_edsa.c -- 2.17.1