leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: ebtables: Use %pM conversion specifier

Browse Source 
ebt_log uses its own implementation of print_mac to print MAC addresses.
This patch converts it to use the %pM conversion specifier for printk.

Signed-off-by: Tobias Klauser <klto@zhaw.ch>
Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Tobias Klauser 2009-08-10 10:10:55 +02:00 committed by Patrick McHardy
parent 549812799c
commit be39ee11cd
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/bridge/netfilter/ebt_log.c
View File

@ -50,14 +50,6 @@ struct arppayload
unsigned char ip_dst[4]; unsigned char ip_dst[4];
}; };
static void print_MAC(const unsigned char *p)
{
int i;
for (i = 0; i < ETH_ALEN; i++, p++)
printk("%02x%c", *p, i == ETH_ALEN - 1 ? ' ':':');
}
static void static void
print_ports(const struct sk_buff *skb, uint8_t protocol, int offset) print_ports(const struct sk_buff *skb, uint8_t protocol, int offset)
{ {
@ -88,14 +80,11 @@ ebt_log_packet(u_int8_t pf, unsigned int hooknum,
unsigned int bitmask; unsigned int bitmask;
spin_lock_bh(&ebt_log_lock); spin_lock_bh(&ebt_log_lock);
printk("<%c>%s IN=%s OUT=%s MAC source = ", '0' + loginfo->u.log.level, printk("<%c>%s IN=%s OUT=%s MAC source = %pM MAC dest = %pM proto = 0x%04x",
prefix, in ? in->name : "", out ? out->name : ""); '0' + loginfo->u.log.level, prefix,
in ? in->name : "", out ? out->name : "",
print_MAC(eth_hdr(skb)->h_source); eth_hdr(skb)->h_source, eth_hdr(skb)->h_dest,
printk("MAC dest = "); ntohs(eth_hdr(skb)->h_proto));
print_MAC(eth_hdr(skb)->h_dest);
printk("proto = 0x%04x", ntohs(eth_hdr(skb)->h_proto));
if (loginfo->type == NF_LOG_TYPE_LOG) if (loginfo->type == NF_LOG_TYPE_LOG)
bitmask = loginfo->u.log.logflags; bitmask = loginfo->u.log.logflags;
@ -171,12 +160,8 @@ ebt_log_packet(u_int8_t pf, unsigned int hooknum,
printk(" INCOMPLETE ARP payload"); printk(" INCOMPLETE ARP payload");
goto out; goto out;
} }
printk(" ARP MAC SRC="); printk(" ARP MAC SRC=%pM ARP IP SRC=%pI4 ARP MAC DST=%pM ARP IP DST=%pI4",
print_MAC(ap->mac_src); ap->mac_src, ap->ip_src, ap->mac_dst, ap->ip_dst);
printk(" ARP IP SRC=%pI4", ap->ip_src);
printk(" ARP MAC DST=");
print_MAC(ap->mac_dst);
printk(" ARP IP DST=%pI4", ap->ip_dst);
} }
} }
out: out: