---

yaml
---
r: 4935
b: refs/heads/master
c: d3984a6
h: refs/heads/master
i:
  4933: 4abe9a9
  4931: 502a9b9
  4927: acc10e9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74bb421da7f39e70ab636ad46ef85ea1178786c5
+refs/heads/master: d3984a6b6abac6203868f0e9095c0ed9e33ece03

trunk/net/ipv6/netfilter/ip6t_LOG.c

@@ -373,9 +373,10 @@ ip6t_log_packet(unsigned int hooknum,
 		in ? in->name : "",
 		out ? out->name : "");
 	if (in && !out) {
+		unsigned int len;
 		/* MAC logging for input chain only. */
 		printk("MAC=");
-		if (skb->dev && skb->dev->hard_header_len &&
+		if (skb->dev && (len = skb->dev->hard_header_len) &&
 		    skb->mac.raw != skb->nh.raw) {
 			unsigned char *p = skb->mac.raw;
 			int i;
@@ -384,9 +385,11 @@ ip6t_log_packet(unsigned int hooknum,
 			    (p -= ETH_HLEN) < skb->head)
 				p = NULL;
 
-			if (p != NULL)
-				for (i = 0; i < skb->dev->hard_header_len; i++)
-					printk("%02x", p[i]);
+			if (p != NULL) {
+				for (i = 0; i < len; i++)
+					printk("%02x%s", p[i],
+					       i == len - 1 ? "" : ":");
+			}
 			printk(" ");
 
 			if (skb->dev->type == ARPHRD_SIT) {