evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netfilter: ipt_LOG/ip6t_LOG: remove comparison within loop

Browse source 
Remove the comparison within the loop to print the macheader by prepending
the colon to all but the first printk.

Based on suggestion by Jan Engelhardt <jengelh@medozas.de>.

Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Patrick McHardy 2010-06-28 14:12:41 +02:00
parent d70a011dbb
commit cf377eb4ae
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/ipv4/netfilter/ipt_LOG.c
View file

@ -411,11 +411,11 @@ ipt_log_packet(u_int8_t pf,
skb->mac_header != skb->network_header) { skb->mac_header != skb->network_header) {
int i; int i;
const unsigned char *p = skb_mac_header(skb); const unsigned char *p = skb_mac_header(skb);
for (i = 0; i < skb->dev->hard_header_len; i++,p++)
printk("%02x%c", *p, printk("%02x", *p++);
i==skb->dev->hard_header_len - 1 for (i = 1; i < skb->dev->hard_header_len; i++, p++)
? ' ':':'); printk(":%02x", *p);
} else }
printk(" "); printk(" ");
} }

6
net/ipv6/netfilter/ip6t_LOG.c
View file

@ -414,9 +414,9 @@ ip6t_log_packet(u_int8_t pf,
p = NULL; p = NULL;
if (p != NULL) { if (p != NULL) {
for (i = 0; i < len; i++) printk("%02x", *p++);
printk("%02x%s", p[i], for (i = 1; i < len; i++)
i == len - 1 ? "" : ":"); printk(":%02x", p[i]);
} }
printk(" "); printk(" ");