Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

authored by

Florian Westphal and committed by
Steffen Klassert
152bca09 a925316a

-14
-2
include/net/xfrm.h
··· 388 388 void xfrm_state_delete_tunnel(struct xfrm_state *x); 389 389 390 390 struct xfrm_type { 391 - char *description; 392 391 struct module *owner; 393 392 u8 proto; 394 393 u8 flags; ··· 409 410 void xfrm_unregister_type(const struct xfrm_type *type, unsigned short family); 410 411 411 412 struct xfrm_type_offload { 412 - char *description; 413 413 struct module *owner; 414 414 u8 proto; 415 415 void (*encap)(struct xfrm_state *, struct sk_buff *pskb);
-1
net/ipv4/ah4.c
··· 554 554 555 555 static const struct xfrm_type ah_type = 556 556 { 557 - .description = "AH4", 558 557 .owner = THIS_MODULE, 559 558 .proto = IPPROTO_AH, 560 559 .flags = XFRM_TYPE_REPLAY_PROT,
-1
net/ipv4/esp4.c
··· 1198 1198 1199 1199 static const struct xfrm_type esp_type = 1200 1200 { 1201 - .description = "ESP4", 1202 1201 .owner = THIS_MODULE, 1203 1202 .proto = IPPROTO_ESP, 1204 1203 .flags = XFRM_TYPE_REPLAY_PROT,
-1
net/ipv4/esp4_offload.c
··· 342 342 }; 343 343 344 344 static const struct xfrm_type_offload esp_type_offload = { 345 - .description = "ESP4 OFFLOAD", 346 345 .owner = THIS_MODULE, 347 346 .proto = IPPROTO_ESP, 348 347 .input_tail = esp_input_tail,
-1
net/ipv4/ipcomp.c
··· 152 152 } 153 153 154 154 static const struct xfrm_type ipcomp_type = { 155 - .description = "IPCOMP4", 156 155 .owner = THIS_MODULE, 157 156 .proto = IPPROTO_COMP, 158 157 .init_state = ipcomp4_init_state,
-1
net/ipv4/xfrm4_tunnel.c
··· 42 42 } 43 43 44 44 static const struct xfrm_type ipip_type = { 45 - .description = "IPIP", 46 45 .owner = THIS_MODULE, 47 46 .proto = IPPROTO_IPIP, 48 47 .init_state = ipip_init_state,
-1
net/ipv6/ah6.c
··· 755 755 } 756 756 757 757 static const struct xfrm_type ah6_type = { 758 - .description = "AH6", 759 758 .owner = THIS_MODULE, 760 759 .proto = IPPROTO_AH, 761 760 .flags = XFRM_TYPE_REPLAY_PROT,
-1
net/ipv6/esp6.c
··· 1243 1243 } 1244 1244 1245 1245 static const struct xfrm_type esp6_type = { 1246 - .description = "ESP6", 1247 1246 .owner = THIS_MODULE, 1248 1247 .proto = IPPROTO_ESP, 1249 1248 .flags = XFRM_TYPE_REPLAY_PROT,
-1
net/ipv6/esp6_offload.c
··· 377 377 }; 378 378 379 379 static const struct xfrm_type_offload esp6_type_offload = { 380 - .description = "ESP6 OFFLOAD", 381 380 .owner = THIS_MODULE, 382 381 .proto = IPPROTO_ESP, 383 382 .input_tail = esp6_input_tail,
-1
net/ipv6/ipcomp6.c
··· 172 172 } 173 173 174 174 static const struct xfrm_type ipcomp6_type = { 175 - .description = "IPCOMP6", 176 175 .owner = THIS_MODULE, 177 176 .proto = IPPROTO_COMP, 178 177 .init_state = ipcomp6_init_state,
-2
net/ipv6/mip6.c
··· 324 324 } 325 325 326 326 static const struct xfrm_type mip6_destopt_type = { 327 - .description = "MIP6DESTOPT", 328 327 .owner = THIS_MODULE, 329 328 .proto = IPPROTO_DSTOPTS, 330 329 .flags = XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_LOCAL_COADDR, ··· 455 456 } 456 457 457 458 static const struct xfrm_type mip6_rthdr_type = { 458 - .description = "MIP6RT", 459 459 .owner = THIS_MODULE, 460 460 .proto = IPPROTO_ROUTING, 461 461 .flags = XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_REMOTE_COADDR,
-1
net/ipv6/xfrm6_tunnel.c
··· 291 291 } 292 292 293 293 static const struct xfrm_type xfrm6_tunnel_type = { 294 - .description = "IP6IP6", 295 294 .owner = THIS_MODULE, 296 295 .proto = IPPROTO_IPV6, 297 296 .init_state = xfrm6_tunnel_init_state,