netfilter: arptables: use arp_hdr_len()
authorChangli Gao <xiaosuo@gmail.com>
Fri, 23 Jul 2010 11:40:53 +0000 (13:40 +0200)
committerPatrick McHardy <kaber@trash.net>
Fri, 23 Jul 2010 11:40:53 +0000 (13:40 +0200)
use arp_hdr_len().

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/ipv4/netfilter/arp_tables.c

index 16c0ba0a272840c499d6e45b482133d1634d22b3..c868dd53e432ea79da5f99512059c23fbb3fc103 100644 (file)
@@ -283,16 +283,13 @@ unsigned int arpt_do_table(struct sk_buff *skb,
        arp = arp_hdr(skb);
        do {
                const struct arpt_entry_target *t;
-               int hdr_len;
 
                if (!arp_packet_match(arp, skb->dev, indev, outdev, &e->arp)) {
                        e = arpt_next_entry(e);
                        continue;
                }
 
-               hdr_len = sizeof(*arp) + (2 * sizeof(struct in_addr)) +
-                       (2 * skb->dev->addr_len);
-               ADD_COUNTER(e->counters, hdr_len, 1);
+               ADD_COUNTER(e->counters, arp_hdr_len(skb->dev), 1);
 
                t = arpt_get_target_c(e);