svn commit: r238524 - projects/pf/head/sys/contrib/pf/net

[Gleb Smirnoff]

Author: glebius
Date: Mon Jul 16 08:55:26 2012
New Revision: 238524
URL: http://svn.freebsd.org/changeset/base/238524

Log:
  Remove unused argument from PFLOG_PACKET().

Modified:
  projects/pf/head/sys/contrib/pf/net/if_pflog.h
  projects/pf/head/sys/contrib/pf/net/pf.c
  projects/pf/head/sys/contrib/pf/net/pf_norm.c

Modified: projects/pf/head/sys/contrib/pf/net/if_pflog.h
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/if_pflog.h	Mon Jul 16 08:48:44 2012	(r238523)
+++ projects/pf/head/sys/contrib/pf/net/if_pflog.h	Mon Jul 16 08:55:26 2012	(r238524)
@@ -69,7 +69,7 @@ struct pf_ruleset;
 struct pfi_kif;
 struct pf_pdesc;
 
-#define	PFLOG_PACKET(i,x,a,b,c,d,e,f,g,h,di) do {	\
+#define	PFLOG_PACKET(i,a,b,c,d,e,f,g,h,di) do {		\
 	if (pflog_packet_ptr != NULL)			\
 		pflog_packet_ptr(i,a,b,c,d,e,f,g,h,di);	\
 } while (0)

Modified: projects/pf/head/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf.c	Mon Jul 16 08:48:44 2012	(r238523)
+++ projects/pf/head/sys/contrib/pf/net/pf.c	Mon Jul 16 08:55:26 2012	(r238524)
@@ -3204,8 +3204,8 @@ pf_test_rule(struct pf_rule **rm, struct
 	if (r->log || (nr != NULL && nr->log)) {
 		if (rewrite)
 			m_copyback(m, off, hdrlen, pd->hdr.any);
-		PFLOG_PACKET(kif, h, m, af, direction, reason, r->log ? r : nr,
-		    a, ruleset, pd, 1);
+		PFLOG_PACKET(kif, m, af, direction, reason, r->log ? r : nr, a,
+		    ruleset, pd, 1);
 	}
 
 	if ((r->action == PF_DROP) &&
@@ -3631,8 +3631,8 @@ pf_test_fragment(struct pf_rule **rm, in
 	REASON_SET(&reason, PFRES_MATCH);
 
 	if (r->log)
-		PFLOG_PACKET(kif, h, m, af, direction, reason, r, a, ruleset,
-		    pd, 1);
+		PFLOG_PACKET(kif, m, af, direction, reason, r, a, ruleset, pd,
+		    1);
 
 	if (r->action != PF_PASS)
 		return (PF_DROP);
@@ -5855,8 +5855,8 @@ done:
 			lr = s->nat_rule.ptr;
 		else
 			lr = r;
-		PFLOG_PACKET(kif, h, m, AF_INET, dir, reason, lr, a, ruleset,
-		    &pd, (s == NULL));
+		PFLOG_PACKET(kif, m, AF_INET, dir, reason, lr, a, ruleset, &pd,
+		    (s == NULL));
 	}
 
 	kif->pfik_bytes[0][dir == PF_OUT][action != PF_PASS] += pd.tot_len;
@@ -6237,7 +6237,7 @@ done:
 			lr = s->nat_rule.ptr;
 		else
 			lr = r;
-		PFLOG_PACKET(kif, h, m, AF_INET6, dir, reason, lr, a, ruleset,
+		PFLOG_PACKET(kif, m, AF_INET6, dir, reason, lr, a, ruleset,
 		    &pd, (s == NULL));
 	}
 

Modified: projects/pf/head/sys/contrib/pf/net/pf_norm.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_norm.c	Mon Jul 16 08:48:44 2012	(r238523)
+++ projects/pf/head/sys/contrib/pf/net/pf_norm.c	Mon Jul 16 08:55:26 2012	(r238524)
@@ -1075,15 +1075,15 @@ pf_normalize_ip(struct mbuf **m0, int di
  no_mem:
 	REASON_SET(reason, PFRES_MEMORY);
 	if (r != NULL && r->log)
-		PFLOG_PACKET(kif, h, m, AF_INET, dir, *reason, r, NULL, NULL,
-		    pd, 1);
+		PFLOG_PACKET(kif, m, AF_INET, dir, *reason, r, NULL, NULL, pd,
+		    1);
 	return (PF_DROP);
 
  drop:
 	REASON_SET(reason, PFRES_NORM);
 	if (r != NULL && r->log)
-		PFLOG_PACKET(kif, h, m, AF_INET, dir, *reason, r, NULL, NULL,
-		    pd, 1);
+		PFLOG_PACKET(kif, m, AF_INET, dir, *reason, r, NULL, NULL, pd,
+		    1);
 	return (PF_DROP);
 
  bad:
@@ -1097,8 +1097,8 @@ pf_normalize_ip(struct mbuf **m0, int di
 
 	REASON_SET(reason, PFRES_FRAG);
 	if (r != NULL && r->log)
-		PFLOG_PACKET(kif, h, m, AF_INET, dir, *reason, r, NULL, NULL,
-		    pd, 1);
+		PFLOG_PACKET(kif, m, AF_INET, dir, *reason, r, NULL, NULL, pd,
+		    1);
 
 	return (PF_DROP);
 }
@@ -1266,22 +1266,22 @@ pf_normalize_ip6(struct mbuf **m0, int d
  shortpkt:
 	REASON_SET(reason, PFRES_SHORT);
 	if (r != NULL && r->log)
-		PFLOG_PACKET(kif, h, m, AF_INET6, dir, *reason, r, NULL, NULL,
-		    pd, 1);
+		PFLOG_PACKET(kif, m, AF_INET6, dir, *reason, r, NULL, NULL, pd,
+		    1);
 	return (PF_DROP);
 
  drop:
 	REASON_SET(reason, PFRES_NORM);
 	if (r != NULL && r->log)
-		PFLOG_PACKET(kif, h, m, AF_INET6, dir, *reason, r, NULL, NULL,
-		    pd, 1);
+		PFLOG_PACKET(kif, m, AF_INET6, dir, *reason, r, NULL, NULL, pd,
+		    1);
 	return (PF_DROP);
 
  badfrag:
 	REASON_SET(reason, PFRES_FRAG);
 	if (r != NULL && r->log)
-		PFLOG_PACKET(kif, h, m, AF_INET6, dir, *reason, r, NULL, NULL,
-		    pd, 1);
+		PFLOG_PACKET(kif, m, AF_INET6, dir, *reason, r, NULL, NULL, pd,
+		    1);
 	return (PF_DROP);
 }
 #endif /* INET6 */
@@ -1399,8 +1399,8 @@ pf_normalize_tcp(int dir, struct pfi_kif
  tcp_drop:
 	REASON_SET(&reason, PFRES_NORM);
 	if (rm != NULL && r->log)
-		PFLOG_PACKET(kif, h, m, AF_INET, dir, reason, r, NULL, NULL,
-		    pd, 1);
+		PFLOG_PACKET(kif, m, AF_INET, dir, reason, r, NULL, NULL, pd,
+		    1);
 	return (PF_DROP);
 }