aboutsummaryrefslogtreecommitdiffstats
path: root/net/netlabel/netlabel_unlabeled.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-06-13 12:21:26 -0400
committerDavid S. Miller <davem@conan.davemloft.net>2011-06-16 23:19:27 -0400
commitea110733874d5176cb56dcf612a629ffac09dbf0 (patch)
treed079bb9990ecf7dadc326b62605fb4de1f6fad4f /net/netlabel/netlabel_unlabeled.c
parent3c8def9776c3d4636291432522ea312f7a44be95 (diff)
net: Remove casts of void *
Unnecessary casts of void * clutter the code. These are the remainder casts after several specific patches to remove netdev_priv and dev_priv. Done via coccinelle script: $ cat cast_void_pointer.cocci @@ type T; T *pt; void *pv; @@ - pt = (T *)pv; + pt = pv; Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Paul Moore <paul.moore@hp.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
Diffstat (limited to 'net/netlabel/netlabel_unlabeled.c')
-rw-r--r--net/netlabel/netlabel_unlabeled.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index 9c38658fba8b..8efd061a0ae9 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -426,10 +426,9 @@ int netlbl_unlhsh_add(struct net *net,
426 audit_info); 426 audit_info);
427 switch (addr_len) { 427 switch (addr_len) {
428 case sizeof(struct in_addr): { 428 case sizeof(struct in_addr): {
429 struct in_addr *addr4, *mask4; 429 const struct in_addr *addr4 = addr;
430 const struct in_addr *mask4 = mask;
430 431
431 addr4 = (struct in_addr *)addr;
432 mask4 = (struct in_addr *)mask;
433 ret_val = netlbl_unlhsh_add_addr4(iface, addr4, mask4, secid); 432 ret_val = netlbl_unlhsh_add_addr4(iface, addr4, mask4, secid);
434 if (audit_buf != NULL) 433 if (audit_buf != NULL)
435 netlbl_af4list_audit_addr(audit_buf, 1, 434 netlbl_af4list_audit_addr(audit_buf, 1,
@@ -440,10 +439,9 @@ int netlbl_unlhsh_add(struct net *net,
440 } 439 }
441#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 440#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
442 case sizeof(struct in6_addr): { 441 case sizeof(struct in6_addr): {
443 struct in6_addr *addr6, *mask6; 442 const struct in6_addr *addr6 = addr;
443 const struct in6_addr *mask6 = mask;
444 444
445 addr6 = (struct in6_addr *)addr;
446 mask6 = (struct in6_addr *)mask;
447 ret_val = netlbl_unlhsh_add_addr6(iface, addr6, mask6, secid); 445 ret_val = netlbl_unlhsh_add_addr6(iface, addr6, mask6, secid);
448 if (audit_buf != NULL) 446 if (audit_buf != NULL)
449 netlbl_af6list_audit_addr(audit_buf, 1, 447 netlbl_af6list_audit_addr(audit_buf, 1,