X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2Fnetlabel%2Fnetlabel_cipso_v4.c;h=24b660f16ce3b5c74bb74035ed935f7a2f96ed86;hb=e9f63f30863fd778a5329e93c7e2208b9bcb5b79;hp=73e0ff469bff284c765bc80ebcc723af3e81f38e;hpb=b22364c8eec89e6b0c081a237f3b6348df87796f;p=linux-2.6-omap-h63xx.git

diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index 73e0ff469bf..24b660f16ce 100644
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -59,7 +59,7 @@ static struct genl_family netlbl_cipsov4_gnl_family = {
 };
 
 /* NetLabel Netlink attribute policy */
-static struct nla_policy netlbl_cipsov4_genl_policy[NLBL_CIPSOV4_A_MAX + 1] = {
+static const struct nla_policy netlbl_cipsov4_genl_policy[NLBL_CIPSOV4_A_MAX + 1] = {
 	[NLBL_CIPSOV4_A_DOI] = { .type = NLA_U32 },
 	[NLBL_CIPSOV4_A_MTYPE] = { .type = NLA_U32 },
 	[NLBL_CIPSOV4_A_TAG] = { .type = NLA_U8 },
@@ -292,7 +292,7 @@ static int netlbl_cipsov4_add_std(struct genl_info *info)
 					}
 			}
 		doi_def->map.std->cat.local = kcalloc(
-			                      doi_def->map.std->cat.local_size,
+					      doi_def->map.std->cat.local_size,
 					      sizeof(u32),
 					      GFP_KERNEL);
 		if (doi_def->map.std->cat.local == NULL) {
@@ -300,7 +300,7 @@ static int netlbl_cipsov4_add_std(struct genl_info *info)
 			goto add_std_failure;
 		}
 		doi_def->map.std->cat.cipso = kcalloc(
-			                      doi_def->map.std->cat.cipso_size,
+					      doi_def->map.std->cat.cipso_size,
 					      sizeof(u32),
 					      GFP_KERNEL);
 		if (doi_def->map.std->cat.cipso == NULL) {
@@ -325,10 +325,10 @@ static int netlbl_cipsov4_add_std(struct genl_info *info)
 				if (cat_loc == NULL || cat_rem == NULL)
 					goto add_std_failure;
 				doi_def->map.std->cat.local[
-				                        nla_get_u32(cat_loc)] =
+							nla_get_u32(cat_loc)] =
 					nla_get_u32(cat_rem);
 				doi_def->map.std->cat.cipso[
-					                nla_get_u32(cat_rem)] =
+							nla_get_u32(cat_rem)] =
 					nla_get_u32(cat_loc);
 			}
 	}