Commit 152bca09 authored by Florian Westphal's avatar Florian Westphal Committed by Steffen Klassert

xfrm: remove description from xfrm_type struct

Its set but never read. Reduces size of xfrm_type to 64 bytes on 64bit.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent a925316a
...@@ -388,7 +388,6 @@ void xfrm_flush_gc(void); ...@@ -388,7 +388,6 @@ void xfrm_flush_gc(void);
void xfrm_state_delete_tunnel(struct xfrm_state *x); void xfrm_state_delete_tunnel(struct xfrm_state *x);
struct xfrm_type { struct xfrm_type {
char *description;
struct module *owner; struct module *owner;
u8 proto; u8 proto;
u8 flags; u8 flags;
...@@ -410,7 +409,6 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family); ...@@ -410,7 +409,6 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family);
void xfrm_unregister_type(const struct xfrm_type *type, unsigned short family); void xfrm_unregister_type(const struct xfrm_type *type, unsigned short family);
struct xfrm_type_offload { struct xfrm_type_offload {
char *description;
struct module *owner; struct module *owner;
u8 proto; u8 proto;
void (*encap)(struct xfrm_state *, struct sk_buff *pskb); void (*encap)(struct xfrm_state *, struct sk_buff *pskb);
......
...@@ -554,7 +554,6 @@ static int ah4_rcv_cb(struct sk_buff *skb, int err) ...@@ -554,7 +554,6 @@ static int ah4_rcv_cb(struct sk_buff *skb, int err)
static const struct xfrm_type ah_type = static const struct xfrm_type ah_type =
{ {
.description = "AH4",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_AH, .proto = IPPROTO_AH,
.flags = XFRM_TYPE_REPLAY_PROT, .flags = XFRM_TYPE_REPLAY_PROT,
......
...@@ -1198,7 +1198,6 @@ static int esp4_rcv_cb(struct sk_buff *skb, int err) ...@@ -1198,7 +1198,6 @@ static int esp4_rcv_cb(struct sk_buff *skb, int err)
static const struct xfrm_type esp_type = static const struct xfrm_type esp_type =
{ {
.description = "ESP4",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_ESP, .proto = IPPROTO_ESP,
.flags = XFRM_TYPE_REPLAY_PROT, .flags = XFRM_TYPE_REPLAY_PROT,
......
...@@ -342,7 +342,6 @@ static const struct net_offload esp4_offload = { ...@@ -342,7 +342,6 @@ static const struct net_offload esp4_offload = {
}; };
static const struct xfrm_type_offload esp_type_offload = { static const struct xfrm_type_offload esp_type_offload = {
.description = "ESP4 OFFLOAD",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_ESP, .proto = IPPROTO_ESP,
.input_tail = esp_input_tail, .input_tail = esp_input_tail,
......
...@@ -152,7 +152,6 @@ static int ipcomp4_rcv_cb(struct sk_buff *skb, int err) ...@@ -152,7 +152,6 @@ static int ipcomp4_rcv_cb(struct sk_buff *skb, int err)
} }
static const struct xfrm_type ipcomp_type = { static const struct xfrm_type ipcomp_type = {
.description = "IPCOMP4",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_COMP, .proto = IPPROTO_COMP,
.init_state = ipcomp4_init_state, .init_state = ipcomp4_init_state,
......
...@@ -42,7 +42,6 @@ static void ipip_destroy(struct xfrm_state *x) ...@@ -42,7 +42,6 @@ static void ipip_destroy(struct xfrm_state *x)
} }
static const struct xfrm_type ipip_type = { static const struct xfrm_type ipip_type = {
.description = "IPIP",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_IPIP, .proto = IPPROTO_IPIP,
.init_state = ipip_init_state, .init_state = ipip_init_state,
......
...@@ -755,7 +755,6 @@ static int ah6_rcv_cb(struct sk_buff *skb, int err) ...@@ -755,7 +755,6 @@ static int ah6_rcv_cb(struct sk_buff *skb, int err)
} }
static const struct xfrm_type ah6_type = { static const struct xfrm_type ah6_type = {
.description = "AH6",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_AH, .proto = IPPROTO_AH,
.flags = XFRM_TYPE_REPLAY_PROT, .flags = XFRM_TYPE_REPLAY_PROT,
......
...@@ -1243,7 +1243,6 @@ static int esp6_rcv_cb(struct sk_buff *skb, int err) ...@@ -1243,7 +1243,6 @@ static int esp6_rcv_cb(struct sk_buff *skb, int err)
} }
static const struct xfrm_type esp6_type = { static const struct xfrm_type esp6_type = {
.description = "ESP6",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_ESP, .proto = IPPROTO_ESP,
.flags = XFRM_TYPE_REPLAY_PROT, .flags = XFRM_TYPE_REPLAY_PROT,
......
...@@ -377,7 +377,6 @@ static const struct net_offload esp6_offload = { ...@@ -377,7 +377,6 @@ static const struct net_offload esp6_offload = {
}; };
static const struct xfrm_type_offload esp6_type_offload = { static const struct xfrm_type_offload esp6_type_offload = {
.description = "ESP6 OFFLOAD",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_ESP, .proto = IPPROTO_ESP,
.input_tail = esp6_input_tail, .input_tail = esp6_input_tail,
......
...@@ -172,7 +172,6 @@ static int ipcomp6_rcv_cb(struct sk_buff *skb, int err) ...@@ -172,7 +172,6 @@ static int ipcomp6_rcv_cb(struct sk_buff *skb, int err)
} }
static const struct xfrm_type ipcomp6_type = { static const struct xfrm_type ipcomp6_type = {
.description = "IPCOMP6",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_COMP, .proto = IPPROTO_COMP,
.init_state = ipcomp6_init_state, .init_state = ipcomp6_init_state,
......
...@@ -324,7 +324,6 @@ static void mip6_destopt_destroy(struct xfrm_state *x) ...@@ -324,7 +324,6 @@ static void mip6_destopt_destroy(struct xfrm_state *x)
} }
static const struct xfrm_type mip6_destopt_type = { static const struct xfrm_type mip6_destopt_type = {
.description = "MIP6DESTOPT",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_DSTOPTS, .proto = IPPROTO_DSTOPTS,
.flags = XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_LOCAL_COADDR, .flags = XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_LOCAL_COADDR,
...@@ -456,7 +455,6 @@ static void mip6_rthdr_destroy(struct xfrm_state *x) ...@@ -456,7 +455,6 @@ static void mip6_rthdr_destroy(struct xfrm_state *x)
} }
static const struct xfrm_type mip6_rthdr_type = { static const struct xfrm_type mip6_rthdr_type = {
.description = "MIP6RT",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_ROUTING, .proto = IPPROTO_ROUTING,
.flags = XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_REMOTE_COADDR, .flags = XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_REMOTE_COADDR,
......
...@@ -291,7 +291,6 @@ static void xfrm6_tunnel_destroy(struct xfrm_state *x) ...@@ -291,7 +291,6 @@ static void xfrm6_tunnel_destroy(struct xfrm_state *x)
} }
static const struct xfrm_type xfrm6_tunnel_type = { static const struct xfrm_type xfrm6_tunnel_type = {
.description = "IP6IP6",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_IPV6, .proto = IPPROTO_IPV6,
.init_state = xfrm6_tunnel_init_state, .init_state = xfrm6_tunnel_init_state,
......
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