summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-20 01:42:37 +0100
committerDavid S. Miller <davem@davemloft.net>2011-02-20 01:42:37 +0100
commitece639caa33c85c8805fa4a0a5955b8de9c95346 (patch)
tree5b8d613601c2e01e876a7d241923e90a0e759c3b /net/ipv6
parentMerge branch 'rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentnetfilter: ip6t_LOG: fix a flaw in printing the MAC (diff)
downloadlinux-ece639caa33c85c8805fa4a0a5955b8de9c95346.tar.xz
linux-ece639caa33c85c8805fa4a0a5955b8de9c95346.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/netfilter/ip6t_LOG.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c
index 09c88891a753..de338037a736 100644
--- a/net/ipv6/netfilter/ip6t_LOG.c
+++ b/net/ipv6/netfilter/ip6t_LOG.c
@@ -410,7 +410,7 @@ fallback:
if (p != NULL) {
sb_add(m, "%02x", *p++);
for (i = 1; i < len; i++)
- sb_add(m, ":%02x", p[i]);
+ sb_add(m, ":%02x", *p++);
}
sb_add(m, " ");