diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2011-11-25 18:35:02 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-26 23:48:15 +0400 |
commit | 7df899c36cf09678bdef1824ce591ef4ac0e9864 (patch) | |
tree | df5d5e8ae7d01d5958432e38ee557ed2d1d154ba /net/dsa/tag_dsa.c | |
parent | ad293b8a218ca13a9ee3e3c98137fa301987577c (diff) | |
download | linux-7df899c36cf09678bdef1824ce591ef4ac0e9864.tar.xz |
dsa: Combine core and tagging code
These files have circular dependencies, so if we make DSA modular then
they must be built into the same module. Therefore, link them
together and merge their respective module init and exit functions.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/tag_dsa.c')
-rw-r--r-- | net/dsa/tag_dsa.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c index 98dfe80b4538..cacce1e22f9c 100644 --- 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); |