Skip to contentSkip to conversation

arptables: use arp_hdr_len()

PATCH Applied Changli Gao 2 participants 2 messages Jul 23, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arptables: use arp_hdr_len()

arptables: use arp_hdr_len()

use arp_hdr_len()

----

 net/ipv4/netfilter/arp_tables.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
net/ipv4/netfilter/arp_tables.c +1 -4
index 16c0ba0..c868dd5 100644
@@ -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);
 
#1 lore raw
Quoted 3 lines · Changli Gao

arptables: use arp_hdr_len()

use arp_hdr_len()

Applied, thanks.