diff options
| author |   Patrick McHardy <kaber@trash.net> | 2010-06-28 14:12:41 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-06-28 14:12:41 +0200 |
| commit | cf377eb4aeded926375d4d0fe0b66ba95f0521e1 (patch) | |
| tree | 010628b36c81d050f4189fb8e94f0cdec60dc3c0 /net | |
| parent | netfilter: complete the deprecation of CONFIG_NF_CT_ACCT (diff) | |
| download | linux-dev-cf377eb4aeded926375d4d0fe0b66ba95f0521e1.tar.xz linux-dev-cf377eb4aeded926375d4d0fe0b66ba95f0521e1.zip | |
netfilter: ipt_LOG/ip6t_LOG: remove comparison within loop
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ipt_LOG.c | 12 | ||||
| -rw-r--r-- | net/ipv6/netfilter/ip6t_LOG.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/ipt_LOG.c index 5234f4f3499a..0a452a54adbe 100644 --- a/net/ipv4/netfilter/ipt_LOG.c +++ b/net/ipv4/netfilter/ipt_LOG.c @@ -411,12 +411,12 @@ ipt_log_packet(u_int8_t pf, skb->mac_header != skb->network_header) { int i; const unsigned char *p = skb_mac_header(skb); - for (i = 0; i < skb->dev->hard_header_len; i++,p++) - printk("%02x%c", *p, - i==skb->dev->hard_header_len - 1 - ? ' ':':'); - } else - printk(" "); + + printk("%02x", *p++); + for (i = 1; i < skb->dev->hard_header_len; i++, p++) + printk(":%02x", *p); + } + printk(" "); } dump_packet(loginfo, skb, 0); diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c index af4ee11f2066..4c7ddac7c62b 100644 --- a/net/ipv6/netfilter/ip6t_LOG.c +++ b/net/ipv6/netfilter/ip6t_LOG.c @@ -414,9 +414,9 @@ ip6t_log_packet(u_int8_t pf, p = NULL; if (p != NULL) { - for (i = 0; i < len; i++) - printk("%02x%s", p[i], - i == len - 1 ? "" : ":"); + printk("%02x", *p++); + for (i = 1; i < len; i++) + printk(":%02x", p[i]); } printk(" "); |