net: dsa: merge dsa.c into dsa2.c
authorVladimir Oltean <vladimir.oltean@nxp.com>
Mon, 21 Nov 2022 13:55:51 +0000 (15:55 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 23 Nov 2022 04:41:52 +0000 (20:41 -0800)
commit165c2fb93bed2e73c63d064b315a9da15a3e4694
tree1dda78ce8d49233ae8edffd871966b9bbad58ac0
parent495550a4844bb4b4d10e26a7d22e9e231adb1b84
net: dsa: merge dsa.c into dsa2.c

There is no longer a meaningful distinction between what goes into
dsa2.c and what goes into dsa.c. Merge the 2 into a single file.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/dsa/Makefile
net/dsa/dsa.c [deleted file]
net/dsa/dsa2.c
net/dsa/dsa_priv.h