diff options
Diffstat (limited to 'net/ipv4/cipso_ipv4.c')
-rw-r--r-- | net/ipv4/cipso_ipv4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index 2ce5b693a8bd..11a3404d65af 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c | |||
@@ -1174,7 +1174,7 @@ static int cipso_v4_map_cat_rng_ntoh(const struct cipso_v4_doi *doi_def, | |||
1174 | u16 cat_low; | 1174 | u16 cat_low; |
1175 | u16 cat_high; | 1175 | u16 cat_high; |
1176 | 1176 | ||
1177 | for(net_iter = 0; net_iter < net_cat_len; net_iter += 4) { | 1177 | for (net_iter = 0; net_iter < net_cat_len; net_iter += 4) { |
1178 | cat_high = ntohs(*((__be16 *)&net_cat[net_iter])); | 1178 | cat_high = ntohs(*((__be16 *)&net_cat[net_iter])); |
1179 | if ((net_iter + 4) <= net_cat_len) | 1179 | if ((net_iter + 4) <= net_cat_len) |
1180 | cat_low = ntohs(*((__be16 *)&net_cat[net_iter + 2])); | 1180 | cat_low = ntohs(*((__be16 *)&net_cat[net_iter + 2])); |
@@ -1676,7 +1676,7 @@ validate_return: | |||
1676 | */ | 1676 | */ |
1677 | void cipso_v4_error(struct sk_buff *skb, int error, u32 gateway) | 1677 | void cipso_v4_error(struct sk_buff *skb, int error, u32 gateway) |
1678 | { | 1678 | { |
1679 | if (skb->nh.iph->protocol == IPPROTO_ICMP || error != -EACCES) | 1679 | if (ip_hdr(skb)->protocol == IPPROTO_ICMP || error != -EACCES) |
1680 | return; | 1680 | return; |
1681 | 1681 | ||
1682 | if (gateway) | 1682 | if (gateway) |