svn commit: r276982 - in head: share/man/man9 sys/sys
Hans Petter Selasky
hselasky at FreeBSD.org
Sun Jan 11 16:15:33 UTC 2015
Author: hselasky
Date: Sun Jan 11 16:15:31 2015
New Revision: 276982
URL: https://svnweb.freebsd.org/changeset/base/276982
Log:
Remove no longer used "M_FLOWID" flag and update the netisr manpage.
This patch completes process started by r275358.
Sponsored by: Mellanox Technologies
Modified:
head/share/man/man9/netisr.9
head/sys/sys/mbuf.h
Modified: head/share/man/man9/netisr.9
==============================================================================
--- head/share/man/man9/netisr.9 Sun Jan 11 15:00:08 2015 (r276981)
+++ head/share/man/man9/netisr.9 Sun Jan 11 16:15:31 2015 (r276982)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 22, 2010
+.Dd January 11, 2015
.Dt NETISR 9
.Os
.Sh NAME
@@ -126,13 +126,13 @@ MIB names, so should not contain whitesp
Protocol handler function that will be invoked on each packet received for
the protocol.
.It Vt netisr_m2flow_t Va nh_m2flow
-Optional protocol function to generate a flow ID and set
-.Dv M_FLOWID
-for packets that do not enter
+Optional protocol function to generate a flow ID and set a valid
+hashtype for packets that enter the
.Nm
with
-.Dv M_FLOWID
-defined.
+.Dv M_HASHTYPE_GET(m)
+equal to
+.Dv M_HASHTYPE_NONE .
Will be used only with
.Dv NETISR_POLICY_FLOW .
.It Vt netisr_m2cpuid_t Va nh_m2cpuid
Modified: head/sys/sys/mbuf.h
==============================================================================
--- head/sys/sys/mbuf.h Sun Jan 11 15:00:08 2015 (r276981)
+++ head/sys/sys/mbuf.h Sun Jan 11 16:15:31 2015 (r276982)
@@ -221,7 +221,7 @@ struct mbuf {
#define M_MCAST 0x00000020 /* send/received as link-level multicast */
#define M_PROMISC 0x00000040 /* packet was not for us */
#define M_VLANTAG 0x00000080 /* ether_vtag is valid */
-#define M_FLOWID 0x00000100 /* deprecated: flowid is valid */
+#define M_UNUSED_8 0x00000100 /* --available-- */
#define M_NOFREE 0x00000200 /* do not free mbuf, embedded in cluster */
#define M_PROTO1 0x00001000 /* protocol-specific */
@@ -248,7 +248,7 @@ struct mbuf {
* Flags preserved when copying m_pkthdr.
*/
#define M_COPYFLAGS \
- (M_PKTHDR|M_EOR|M_RDONLY|M_BCAST|M_MCAST|M_PROMISC|M_VLANTAG|M_FLOWID| \
+ (M_PKTHDR|M_EOR|M_RDONLY|M_BCAST|M_MCAST|M_PROMISC|M_VLANTAG| \
M_PROTOFLAGS)
/*
@@ -256,7 +256,7 @@ struct mbuf {
*/
#define M_FLAG_BITS \
"\20\1M_EXT\2M_PKTHDR\3M_EOR\4M_RDONLY\5M_BCAST\6M_MCAST" \
- "\7M_PROMISC\10M_VLANTAG\11M_FLOWID"
+ "\7M_PROMISC\10M_VLANTAG"
#define M_FLAG_PROTOBITS \
"\15M_PROTO1\16M_PROTO2\17M_PROTO3\20M_PROTO4\21M_PROTO5" \
"\22M_PROTO6\23M_PROTO7\24M_PROTO8\25M_PROTO9\26M_PROTO10" \
More information about the svn-src-all
mailing list