svn commit: r268788 - head/sys/netinet

[Adrian Chadd]

Author: adrian
Date: Thu Jul 17 05:45:54 2014
New Revision: 268788
URL: http://svnweb.freebsd.org/changeset/base/268788

Log:
  Oops - somehow I missed the IP option numbers clashing with the multicast
  numbers below.
  
  Move them to a new set of non-clashing numbers.

Modified:
  head/sys/netinet/in.h

Modified: head/sys/netinet/in.h
==============================================================================
--- head/sys/netinet/in.h	Thu Jul 17 05:21:16 2014	(r268787)
+++ head/sys/netinet/in.h	Thu Jul 17 05:45:54 2014	(r268788)
@@ -470,10 +470,6 @@ __END_DECLS
 #define	IP_MINTTL		66   /* minimum TTL for packet or drop */
 #define	IP_DONTFRAG		67   /* don't fragment packet */
 #define	IP_RECVTOS		68   /* bool; receive IP TOS w/dgram */
-#define	IP_FLOWID		69   /* get flow id for the given socket/inp */
-#define	IP_FLOWTYPE		70   /* get flow type (M_HASHTYPE) */
-/* 71 - XXX was IP_RSSCPUID - can recycle whenever */
-#define	IP_RSSBUCKETID		72   /* get RSS flowid -> bucket mapping */
 
 /* IPv4 Source Filter Multicast API [RFC3678] */
 #define	IP_ADD_SOURCE_MEMBERSHIP	70   /* join a source-specific group */
@@ -492,6 +488,11 @@ __END_DECLS
 #define	MCAST_BLOCK_SOURCE		84   /* block a source */
 #define	MCAST_UNBLOCK_SOURCE		85   /* unblock a source */
 
+/* Flow and RSS definitions */
+#define	IP_FLOWID		90   /* get flow id for the given socket/inp */
+#define	IP_FLOWTYPE		91   /* get flow type (M_HASHTYPE) */
+#define	IP_RSSBUCKETID		92   /* get RSS flowid -> bucket mapping */
+
 /*
  * Defaults and limits for options
  */