diff options
author | Masahide NAKAMURA <nakam@linux-ipv6.org> | 2007-06-27 02:57:49 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-11 01:15:43 -0400 |
commit | d3d6dd3adaaad71eae20902ed81808a66a40a5b9 (patch) | |
tree | b08faa2174867f3f589889695bfa8388d2237f1e /net | |
parent | 59fbb3a61e02deaeaa4fb50792217921f3002d64 (diff) |
[XFRM]: Add module alias for transformation type.
It is clean-up for XFRM type modules and adds aliases with its
protocol:
ESP, AH, IPCOMP, IPIP and IPv6 for IPsec
ROUTING and DSTOPTS for MIPv6
It is almost the same thing as XFRM mode alias, but it is added
new defines XFRM_PROTO_XXX for preprocessing since some protocols
are defined as enum.
Signed-off-by: Masahide NAKAMURA <nakam@linux-ipv6.org>
Acked-by: Ingo Oeser <netdev@axxeo.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/ah4.c | 1 | ||||
-rw-r--r-- | net/ipv4/esp4.c | 1 | ||||
-rw-r--r-- | net/ipv4/ipcomp.c | 1 | ||||
-rw-r--r-- | net/ipv4/xfrm4_tunnel.c | 1 | ||||
-rw-r--r-- | net/ipv6/ah6.c | 1 | ||||
-rw-r--r-- | net/ipv6/esp6.c | 1 | ||||
-rw-r--r-- | net/ipv6/ipcomp6.c | 2 | ||||
-rw-r--r-- | net/ipv6/mip6.c | 2 | ||||
-rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 1 |
9 files changed, 10 insertions, 1 deletions
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c index 6da8ff597ad3..7a23e59c374a 100644 --- a/net/ipv4/ah4.c +++ b/net/ipv4/ah4.c | |||
@@ -339,3 +339,4 @@ static void __exit ah4_fini(void) | |||
339 | module_init(ah4_init); | 339 | module_init(ah4_init); |
340 | module_exit(ah4_fini); | 340 | module_exit(ah4_fini); |
341 | MODULE_LICENSE("GPL"); | 341 | MODULE_LICENSE("GPL"); |
342 | MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_AH); | ||
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 47c95e8ef045..98767a4f1185 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c | |||
@@ -481,3 +481,4 @@ static void __exit esp4_fini(void) | |||
481 | module_init(esp4_init); | 481 | module_init(esp4_init); |
482 | module_exit(esp4_fini); | 482 | module_exit(esp4_fini); |
483 | MODULE_LICENSE("GPL"); | 483 | MODULE_LICENSE("GPL"); |
484 | MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_ESP); | ||
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index ab86137c71d2..e787044a8514 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c | |||
@@ -485,3 +485,4 @@ MODULE_LICENSE("GPL"); | |||
485 | MODULE_DESCRIPTION("IP Payload Compression Protocol (IPComp) - RFC3173"); | 485 | MODULE_DESCRIPTION("IP Payload Compression Protocol (IPComp) - RFC3173"); |
486 | MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>"); | 486 | MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>"); |
487 | 487 | ||
488 | MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_COMP); | ||
diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c index 568510304553..9275c79119b6 100644 --- a/net/ipv4/xfrm4_tunnel.c +++ b/net/ipv4/xfrm4_tunnel.c | |||
@@ -109,3 +109,4 @@ static void __exit ipip_fini(void) | |||
109 | module_init(ipip_init); | 109 | module_init(ipip_init); |
110 | module_exit(ipip_fini); | 110 | module_exit(ipip_fini); |
111 | MODULE_LICENSE("GPL"); | 111 | MODULE_LICENSE("GPL"); |
112 | MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_IPIP); | ||
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index cc6884a40be4..53f46ab6af70 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c | |||
@@ -554,3 +554,4 @@ module_init(ah6_init); | |||
554 | module_exit(ah6_fini); | 554 | module_exit(ah6_fini); |
555 | 555 | ||
556 | MODULE_LICENSE("GPL"); | 556 | MODULE_LICENSE("GPL"); |
557 | MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_AH); | ||
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 7107bb7e2e62..2db31ce3c7e6 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
@@ -421,3 +421,4 @@ module_init(esp6_init); | |||
421 | module_exit(esp6_fini); | 421 | module_exit(esp6_fini); |
422 | 422 | ||
423 | MODULE_LICENSE("GPL"); | 423 | MODULE_LICENSE("GPL"); |
424 | MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_ESP); | ||
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index 1ee50b5782e1..473f165310ea 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c | |||
@@ -500,4 +500,4 @@ MODULE_LICENSE("GPL"); | |||
500 | MODULE_DESCRIPTION("IP Payload Compression Protocol (IPComp) for IPv6 - RFC3173"); | 500 | MODULE_DESCRIPTION("IP Payload Compression Protocol (IPComp) for IPv6 - RFC3173"); |
501 | MODULE_AUTHOR("Mitsuru KANDA <mk@linux-ipv6.org>"); | 501 | MODULE_AUTHOR("Mitsuru KANDA <mk@linux-ipv6.org>"); |
502 | 502 | ||
503 | 503 | MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_COMP); | |
diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c index 20c78ecff6a1..8a1399ce38ce 100644 --- a/net/ipv6/mip6.c +++ b/net/ipv6/mip6.c | |||
@@ -514,3 +514,5 @@ module_init(mip6_init); | |||
514 | module_exit(mip6_fini); | 514 | module_exit(mip6_fini); |
515 | 515 | ||
516 | MODULE_LICENSE("GPL"); | 516 | MODULE_LICENSE("GPL"); |
517 | MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_DSTOPTS); | ||
518 | MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_ROUTING); | ||
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index 5502cc948dfb..6f87dd568ded 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
@@ -379,3 +379,4 @@ static void __exit xfrm6_tunnel_fini(void) | |||
379 | module_init(xfrm6_tunnel_init); | 379 | module_init(xfrm6_tunnel_init); |
380 | module_exit(xfrm6_tunnel_fini); | 380 | module_exit(xfrm6_tunnel_fini); |
381 | MODULE_LICENSE("GPL"); | 381 | MODULE_LICENSE("GPL"); |
382 | MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_IPV6); | ||