svn commit: r350748 - head/sys/netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Thu Aug  8 10:59:54 2019
New Revision: 350748
URL: https://svnweb.freebsd.org/changeset/base/350748

Log:
  frag6: move public structure into file local space.
  
  Move ip6asfrag and the accompanying IP6_REASS_MBUF macro from
  ip6_var.h into frag6.c as they are not used outside frag6.c.
  Sadly struct ip6q is all over the mac framework so we have to
  leave it public.
  
  This reduces the public KPI space.
  
  MFC after:		3 months
  X-MFC:			possibly MFC the #define only to stable branches
  Sponsored by:		Netflix

Modified:
  head/sys/netinet6/frag6.c
  head/sys/netinet6/ip6_var.h

Modified: head/sys/netinet6/frag6.c
==============================================================================
--- head/sys/netinet6/frag6.c	Thu Aug  8 10:15:47 2019	(r350747)
+++ head/sys/netinet6/frag6.c	Thu Aug  8 10:59:54 2019	(r350748)
@@ -86,6 +86,18 @@ struct ip6qbucket {
 	int		count;
 };
 
+struct	ip6asfrag {
+	struct ip6asfrag *ip6af_down;
+	struct ip6asfrag *ip6af_up;
+	struct mbuf	*ip6af_m;
+	int		ip6af_offset;	/* offset in ip6af_m to next header */
+	int		ip6af_frglen;	/* fragmentable part length */
+	int		ip6af_off;	/* fragment offset */
+	u_int16_t	ip6af_mff;	/* more fragment bit in frag off */
+};
+
+#define IP6_REASS_MBUF(ip6af) (*(struct mbuf **)&((ip6af)->ip6af_m))
+
 static MALLOC_DEFINE(M_FRAG6, "frag6", "IPv6 fragment reassembly header");
 
 /* System wide (global) maximum and count of packets in reassembly queues. */ 

Modified: head/sys/netinet6/ip6_var.h
==============================================================================
--- head/sys/netinet6/ip6_var.h	Thu Aug  8 10:15:47 2019	(r350747)
+++ head/sys/netinet6/ip6_var.h	Thu Aug  8 10:59:54 2019	(r350748)
@@ -68,6 +68,7 @@
 
 #include <sys/epoch.h>
 
+struct ip6asfrag;
 /*
  * IP6 reassembly queue structure.  Each fragment
  * being reassembled is attached to one of these structures.
@@ -83,24 +84,9 @@ struct	ip6q {
 	struct ip6q	*ip6q_next;
 	struct ip6q	*ip6q_prev;
 	int		ip6q_unfrglen;	/* len of unfragmentable part */
-#ifdef notyet
-	u_char		*ip6q_nxtp;
-#endif
 	int		ip6q_nfrag;	/* # of fragments */
 	struct label	*ip6q_label;
 };
-
-struct	ip6asfrag {
-	struct ip6asfrag *ip6af_down;
-	struct ip6asfrag *ip6af_up;
-	struct mbuf	*ip6af_m;
-	int		ip6af_offset;	/* offset in ip6af_m to next header */
-	int		ip6af_frglen;	/* fragmentable part length */
-	int		ip6af_off;	/* fragment offset */
-	u_int16_t	ip6af_mff;	/* more fragment bit in frag off */
-};
-
-#define IP6_REASS_MBUF(ip6af) (*(struct mbuf **)&((ip6af)->ip6af_m))
 
 /*
  * IP6 reinjecting structure.