Commit 2f647ecc authored by Thomas Schlichter's avatar Thomas Schlichter Committed by Hideaki Yoshifuji

[NET]: IPSEC protocol module owner cleanup.

parent a6011056
...@@ -567,7 +567,7 @@ static struct inet_protocol esp4_protocol = { ...@@ -567,7 +567,7 @@ static struct inet_protocol esp4_protocol = {
.no_policy = 1, .no_policy = 1,
}; };
int __init esp4_init(void) static int __init esp4_init(void)
{ {
struct xfrm_decap_state decap; struct xfrm_decap_state decap;
...@@ -578,7 +578,6 @@ int __init esp4_init(void) ...@@ -578,7 +578,6 @@ int __init esp4_init(void)
decap_data_too_small(); decap_data_too_small();
} }
esp_type.owner = THIS_MODULE;
if (xfrm_register_type(&esp_type, AF_INET) < 0) { if (xfrm_register_type(&esp_type, AF_INET) < 0) {
printk(KERN_INFO "ip esp init: can't add xfrm type\n"); printk(KERN_INFO "ip esp init: can't add xfrm type\n");
return -EAGAIN; return -EAGAIN;
......
...@@ -382,9 +382,9 @@ static int ipcomp_init_state(struct xfrm_state *x, void *args) ...@@ -382,9 +382,9 @@ static int ipcomp_init_state(struct xfrm_state *x, void *args)
goto out; goto out;
} }
static struct xfrm_type ipcomp_type = static struct xfrm_type ipcomp_type = {
{
.description = "IPCOMP4", .description = "IPCOMP4",
.owner = THIS_MODULE,
.proto = IPPROTO_COMP, .proto = IPPROTO_COMP,
.init_state = ipcomp_init_state, .init_state = ipcomp_init_state,
.destructor = ipcomp_destroy, .destructor = ipcomp_destroy,
...@@ -400,7 +400,6 @@ static struct inet_protocol ipcomp4_protocol = { ...@@ -400,7 +400,6 @@ static struct inet_protocol ipcomp4_protocol = {
static int __init ipcomp4_init(void) static int __init ipcomp4_init(void)
{ {
ipcomp_type.owner = THIS_MODULE;
if (xfrm_register_type(&ipcomp_type, AF_INET) < 0) { if (xfrm_register_type(&ipcomp_type, AF_INET) < 0) {
printk(KERN_INFO "ipcomp init: can't add xfrm type\n"); printk(KERN_INFO "ipcomp init: can't add xfrm type\n");
return -EAGAIN; return -EAGAIN;
......
...@@ -215,6 +215,7 @@ static void ipip_destroy(struct xfrm_state *x) ...@@ -215,6 +215,7 @@ static void ipip_destroy(struct xfrm_state *x)
static struct xfrm_type ipip_type = { static struct xfrm_type ipip_type = {
.description = "IPIP", .description = "IPIP",
.owner = THIS_MODULE,
.proto = IPPROTO_IPIP, .proto = IPPROTO_IPIP,
.init_state = ipip_init_state, .init_state = ipip_init_state,
.destructor = ipip_destroy, .destructor = ipip_destroy,
...@@ -229,7 +230,6 @@ static struct inet_protocol ipip_protocol = { ...@@ -229,7 +230,6 @@ static struct inet_protocol ipip_protocol = {
static int __init ipip_init(void) static int __init ipip_init(void)
{ {
ipip_type.owner = THIS_MODULE;
if (xfrm_register_type(&ipip_type, AF_INET) < 0) { if (xfrm_register_type(&ipip_type, AF_INET) < 0) {
printk(KERN_INFO "ipip init: can't add xfrm type\n"); printk(KERN_INFO "ipip init: can't add xfrm type\n");
return -EAGAIN; return -EAGAIN;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment