dsa: Combine core and tagging code

[deliverable/linux.git] / net / dsa / tag_dsa.c

diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c
index 98dfe80b45381f1c5b4bea6459f8d1b5e932c870..cacce1e22f9caa029c2374cd93c2e071932f365c 100644 (file)
--- a/net/dsa/tag_dsa.c
+++ b/net/dsa/tag_dsa.c
@@ -186,20 +186,7 @@ out:
        return 0;
 }
 
-static struct packet_type dsa_packet_type __read_mostly = {
+struct packet_type dsa_packet_type __read_mostly = {
        .type   = cpu_to_be16(ETH_P_DSA),
        .func   = dsa_rcv,
 };
-
-static int __init dsa_init_module(void)
-{
-       dev_add_pack(&dsa_packet_type);
-       return 0;
-}
-module_init(dsa_init_module);
-
-static void __exit dsa_cleanup_module(void)
-{
-       dev_remove_pack(&dsa_packet_type);
-}
-module_exit(dsa_cleanup_module);