lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[XFRM]: constify 'struct xfrm_type'

Browse Source 
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet
2008-01-30 19:11:50 -08:00
committed by David S. Miller
parent 2216b48376
commit 533cb5b0a6
11 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/net/xfrm.h
View File

@@ -202,7 +202,7 @@ struct xfrm_state
/* Reference to data common to all the instances of this /* Reference to data common to all the instances of this
* transformer. */ * transformer. */
struct xfrm_type *type; const struct xfrm_type *type;
struct xfrm_mode *inner_mode; struct xfrm_mode *inner_mode;
struct xfrm_mode *outer_mode; struct xfrm_mode *outer_mode;
@@ -279,7 +279,7 @@ struct xfrm_state_afinfo {
unsigned int proto; unsigned int proto;
unsigned int eth_proto; unsigned int eth_proto;
struct module *owner; struct module *owner;
struct xfrm_type *type_map[IPPROTO_MAX]; const struct xfrm_type *type_map[IPPROTO_MAX];
struct xfrm_mode *mode_map[XFRM_MODE_MAX]; struct xfrm_mode *mode_map[XFRM_MODE_MAX];
int (*init_flags)(struct xfrm_state *x); int (*init_flags)(struct xfrm_state *x);
void (*init_tempsel)(struct xfrm_state *x, struct flowi *fl, void (*init_tempsel)(struct xfrm_state *x, struct flowi *fl,
@@ -322,8 +322,8 @@ struct xfrm_type
u32 (*get_mtu)(struct xfrm_state *, int size); u32 (*get_mtu)(struct xfrm_state *, int size);
}; };
extern int xfrm_register_type(struct xfrm_type *type, unsigned short family); extern int xfrm_register_type(const struct xfrm_type *type, unsigned short family);
extern int xfrm_unregister_type(struct xfrm_type *type, unsigned short family); extern int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family);
struct xfrm_mode { struct xfrm_mode {
/* /*

2
net/ipv4/ah4.c
View File

@@ -300,7 +300,7 @@ static void ah_destroy(struct xfrm_state *x)
} }
static struct xfrm_type ah_type = static const struct xfrm_type ah_type =
{ {
.description = "AH4", .description = "AH4",
.owner = THIS_MODULE, .owner = THIS_MODULE,

2
net/ipv4/esp4.c
View File

@@ -600,7 +600,7 @@ error:
return err; return err;
} }
static struct xfrm_type esp_type = static const struct xfrm_type esp_type =
{ {
.description = "ESP4", .description = "ESP4",
.owner = THIS_MODULE, .owner = THIS_MODULE,

2
net/ipv4/ipcomp.c
View File

@@ -437,7 +437,7 @@ error:
goto out; goto out;
} }
static struct xfrm_type ipcomp_type = { static const struct xfrm_type ipcomp_type = {
.description = "IPCOMP4", .description = "IPCOMP4",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_COMP, .proto = IPPROTO_COMP,

2
net/ipv4/xfrm4_tunnel.c
View File

@@ -38,7 +38,7 @@ static void ipip_destroy(struct xfrm_state *x)
{ {
} }
static struct xfrm_type ipip_type = { static const struct xfrm_type ipip_type = {
.description = "IPIP", .description = "IPIP",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_IPIP, .proto = IPPROTO_IPIP,

2
net/ipv6/ah6.c
View File

@@ -515,7 +515,7 @@ static void ah6_destroy(struct xfrm_state *x)
kfree(ahp); kfree(ahp);
} }
static struct xfrm_type ah6_type = static const struct xfrm_type ah6_type =
{ {
.description = "AH6", .description = "AH6",
.owner = THIS_MODULE, .owner = THIS_MODULE,

2
net/ipv6/esp6.c
View File

@@ -538,7 +538,7 @@ error:
return err; return err;
} }
static struct xfrm_type esp6_type = static const struct xfrm_type esp6_type =
{ {
.description = "ESP6", .description = "ESP6",
.owner = THIS_MODULE, .owner = THIS_MODULE,

2
net/ipv6/ipcomp6.c
View File

@@ -453,7 +453,7 @@ error:
goto out; goto out;
} }
static struct xfrm_type ipcomp6_type = static const struct xfrm_type ipcomp6_type =
{ {
.description = "IPCOMP6", .description = "IPCOMP6",
.owner = THIS_MODULE, .owner = THIS_MODULE,

4
net/ipv6/mip6.c
View File

@@ -330,7 +330,7 @@ static void mip6_destopt_destroy(struct xfrm_state *x)
{ {
} }
static struct xfrm_type mip6_destopt_type = static const struct xfrm_type mip6_destopt_type =
{ {
.description = "MIP6DESTOPT", .description = "MIP6DESTOPT",
.owner = THIS_MODULE, .owner = THIS_MODULE,
@@ -462,7 +462,7 @@ static void mip6_rthdr_destroy(struct xfrm_state *x)
{ {
} }
static struct xfrm_type mip6_rthdr_type = static const struct xfrm_type mip6_rthdr_type =
{ {
.description = "MIP6RT", .description = "MIP6RT",
.owner = THIS_MODULE, .owner = THIS_MODULE,

2
net/ipv6/xfrm6_tunnel.c
View File

@@ -319,7 +319,7 @@ static void xfrm6_tunnel_destroy(struct xfrm_state *x)
xfrm6_tunnel_free_spi((xfrm_address_t *)&x->props.saddr); xfrm6_tunnel_free_spi((xfrm_address_t *)&x->props.saddr);
} }
static struct xfrm_type xfrm6_tunnel_type = { static const struct xfrm_type xfrm6_tunnel_type = {
.description = "IP6IP6", .description = "IP6IP6",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_IPV6, .proto = IPPROTO_IPV6,

16
net/xfrm/xfrm_state.c
View File

@@ -216,10 +216,10 @@ static void xfrm_state_unlock_afinfo(struct xfrm_state_afinfo *afinfo)
write_unlock_bh(&xfrm_state_afinfo_lock); write_unlock_bh(&xfrm_state_afinfo_lock);
} }
int xfrm_register_type(struct xfrm_type *type, unsigned short family) int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
{ {
struct xfrm_state_afinfo *afinfo = xfrm_state_lock_afinfo(family); struct xfrm_state_afinfo *afinfo = xfrm_state_lock_afinfo(family);
struct xfrm_type **typemap; const struct xfrm_type **typemap;
int err = 0; int err = 0;
if (unlikely(afinfo == NULL)) if (unlikely(afinfo == NULL))
@@ -235,10 +235,10 @@ int xfrm_register_type(struct xfrm_type *type, unsigned short family)
} }
EXPORT_SYMBOL(xfrm_register_type); EXPORT_SYMBOL(xfrm_register_type);
int xfrm_unregister_type(struct xfrm_type *type, unsigned short family) int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
{ {
struct xfrm_state_afinfo *afinfo = xfrm_state_lock_afinfo(family); struct xfrm_state_afinfo *afinfo = xfrm_state_lock_afinfo(family);
struct xfrm_type **typemap; const struct xfrm_type **typemap;
int err = 0; int err = 0;
if (unlikely(afinfo == NULL)) if (unlikely(afinfo == NULL))
@@ -254,11 +254,11 @@ int xfrm_unregister_type(struct xfrm_type *type, unsigned short family)
} }
EXPORT_SYMBOL(xfrm_unregister_type); EXPORT_SYMBOL(xfrm_unregister_type);
static struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family) static const struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family)
{ {
struct xfrm_state_afinfo *afinfo; struct xfrm_state_afinfo *afinfo;
struct xfrm_type **typemap; const struct xfrm_type **typemap;
struct xfrm_type *type; const struct xfrm_type *type;
int modload_attempted = 0; int modload_attempted = 0;
retry: retry:
@@ -281,7 +281,7 @@ retry:
return type; return type;
} }
static void xfrm_put_type(struct xfrm_type *type) static void xfrm_put_type(const struct xfrm_type *type)
{ {
module_put(type->owner); module_put(type->owner);
} }