diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-19 19:42:37 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-19 19:42:37 -0500 |
| commit | ece639caa33c85c8805fa4a0a5955b8de9c95346 (patch) | |
| tree | 5b8d613601c2e01e876a7d241923e90a0e759c3b /net/ipv6 | |
| parent | 0cc9d5257857608ba85885b75fcada13d359b5d1 (diff) | |
| parent | 0af320fb4627033e49cbc6e8138e7aa75ab8352a (diff) | |
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.c | 2 |
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: | |||
| 410 | if (p != NULL) { | 410 | if (p != NULL) { |
| 411 | sb_add(m, "%02x", *p++); | 411 | sb_add(m, "%02x", *p++); |
| 412 | for (i = 1; i < len; i++) | 412 | for (i = 1; i < len; i++) |
| 413 | sb_add(m, ":%02x", p[i]); | 413 | sb_add(m, ":%02x", *p++); |
| 414 | } | 414 | } |
| 415 | sb_add(m, " "); | 415 | sb_add(m, " "); |
| 416 | 416 | ||