Author: np
Date: Thu Jun 23 21:07:15 2016
New Revision: 302153
URL: https://svnweb.freebsd.org/changeset/base/302153

Log:
  Add spares to struct ifnet and socket for packet pacing and/or general
  use.  Update comments regarding the spare fields in struct inpcb.
  
  Bump __FreeBSD_version for the changes to the size of the structures.
  
  Reviewed by:  gnn@
  Approved by:  re@ (gjb@)
  Sponsored by: Chelsio Communications

Modified:
  head/sys/net/if_var.h
  head/sys/netinet/in_pcb.h
  head/sys/sys/param.h
  head/sys/sys/socketvar.h

Modified: head/sys/net/if_var.h
==============================================================================
--- head/sys/net/if_var.h       Thu Jun 23 21:02:05 2016        (r302152)
+++ head/sys/net/if_var.h       Thu Jun 23 21:07:15 2016        (r302153)
@@ -311,6 +311,8 @@ struct ifnet {
         * that structure can be enhanced without changing the kernel
         * binary interface.
         */
+       void    *if_pspare[4];          /* packet pacing / general use */
+       int     if_ispare[4];           /* packet pacing / general use */
 };
 
 /* for compatibility with other BSDs */

Modified: head/sys/netinet/in_pcb.h
==============================================================================
--- head/sys/netinet/in_pcb.h   Thu Jun 23 21:02:05 2016        (r302152)
+++ head/sys/netinet/in_pcb.h   Thu Jun 23 21:07:15 2016        (r302153)
@@ -202,10 +202,10 @@ struct inpcb {
        u_char  inp_ip_minttl;          /* (i) minimum TTL or drop */
        uint32_t inp_flowid;            /* (x) flow id / queue id */
        u_int   inp_refcount;           /* (i) refcount */
-       void    *inp_pspare[5];         /* (x) route caching / general use */
+       void    *inp_pspare[5];         /* (x) packet pacing / general use */
        uint32_t inp_flowtype;          /* (x) M_HASHTYPE value */
        uint32_t inp_rss_listen_bucket; /* (x) overridden RSS listen bucket */
-       u_int   inp_ispare[4];          /* (x) route caching / user cookie /
+       u_int   inp_ispare[4];          /* (x) packet pacing / user cookie /
                                         *     general use */
 
        /* Local and foreign ports, local and foreign addr. */

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h        Thu Jun 23 21:02:05 2016        (r302152)
+++ head/sys/sys/param.h        Thu Jun 23 21:07:15 2016        (r302153)
@@ -58,7 +58,7 @@
  *             in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100119      /* Master, propagated to newvers */
+#define __FreeBSD_version 1100120      /* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,

Modified: head/sys/sys/socketvar.h
==============================================================================
--- head/sys/sys/socketvar.h    Thu Jun 23 21:02:05 2016        (r302152)
+++ head/sys/sys/socketvar.h    Thu Jun 23 21:07:15 2016        (r302153)
@@ -126,6 +126,9 @@ struct socket {
         */
        int so_fibnum;          /* routing domain for this socket */
        uint32_t so_user_cookie;
+
+       void *so_pspare[2];     /* packet pacing / general use */
+       int so_ispare[2];       /* packet pacing / general use */
 };
 
 /*
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to