Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 18 Jun 2015 21:25:08 +0000 (UTC)
From:      Kristof Provost <kp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r284581 - stable/10/sys/netpfil/pf
Message-ID:  <201506182125.t5ILP8NU054207@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kp
Date: Thu Jun 18 21:25:07 2015
New Revision: 284581
URL: https://svnweb.freebsd.org/changeset/base/284581

Log:
  Merge r284280
  
  pf: Remove frc_direction
  
  We don't use the direction of the fragments for anything. The frc_direction
  field is assigned, but never read.
  Just remove it.
  
  Differential Revision:	https://reviews.freebsd.org/D2825
  Reviewed by:	gnn

Modified:
  stable/10/sys/netpfil/pf/pf_norm.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netpfil/pf/pf_norm.c
==============================================================================
--- stable/10/sys/netpfil/pf/pf_norm.c	Thu Jun 18 21:23:41 2015	(r284580)
+++ stable/10/sys/netpfil/pf/pf_norm.c	Thu Jun 18 21:25:07 2015	(r284581)
@@ -75,7 +75,6 @@ struct pf_fragment_cmp {
 	uint32_t	frc_id;
 	sa_family_t	frc_af;
 	uint8_t		frc_proto;
-	uint8_t		frc_direction;
 };
 
 struct pf_fragment {
@@ -85,7 +84,6 @@ struct pf_fragment {
 #define fr_id	fr_key.frc_id
 #define fr_af	fr_key.frc_af
 #define fr_proto	fr_key.frc_proto
-#define fr_direction	fr_key.frc_direction
 
 	RB_ENTRY(pf_fragment) fr_entry;
 	TAILQ_ENTRY(pf_fragment) frag_next;
@@ -155,7 +153,7 @@ static struct mbuf *pf_fragcache(struct 
 #endif	/* INET */
 #ifdef INET6
 static int	pf_reassemble6(struct mbuf **, struct ip6_hdr *,
-		    struct ip6_frag *, uint16_t, uint16_t, int, u_short *);
+		    struct ip6_frag *, uint16_t, uint16_t, u_short *);
 static void	pf_scrub_ip6(struct mbuf **, uint8_t);
 #endif	/* INET6 */
 
@@ -176,7 +174,6 @@ pf_ip2key(struct ip *ip, int dir, struct
 	key->frc_af = AF_INET;
 	key->frc_proto = ip->ip_p;
 	key->frc_id = ip->ip_id;
-	key->frc_direction = dir;
 }
 #endif	/* INET */
 
@@ -665,7 +662,7 @@ pf_reassemble(struct mbuf **m0, struct i
 #ifdef INET6
 static int
 pf_reassemble6(struct mbuf **m0, struct ip6_hdr *ip6, struct ip6_frag *fraghdr,
-    uint16_t hdrlen, uint16_t extoff, int dir, u_short *reason)
+    uint16_t hdrlen, uint16_t extoff, u_short *reason)
 {
 	struct mbuf		*m = *m0;
 	struct pf_frent		*frent;
@@ -699,7 +696,6 @@ pf_reassemble6(struct mbuf **m0, struct 
 	/* Only the first fragment's protocol is relevant. */
 	key.frc_proto = 0;
 	key.frc_id = fraghdr->ip6f_ident;
-	key.frc_direction = dir;
 
 	if ((frag = pf_fillup_fragment(&key, frent, reason)) == NULL) {
 		PF_FRAG_UNLOCK();
@@ -1572,7 +1568,7 @@ pf_normalize_ip6(struct mbuf **m0, int d
 	off += sizeof(frag);
 
 	/* Returns PF_DROP or *m0 is NULL or completely reassembled mbuf. */
-	if (pf_reassemble6(m0, h, &frag, off, extoff, dir, reason) != PF_PASS)
+	if (pf_reassemble6(m0, h, &frag, off, extoff, reason) != PF_PASS)
 		return (PF_DROP);
 	m = *m0;
 	if (m == NULL)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506182125.t5ILP8NU054207>