Module Name: src
Committed By: maxv
Date: Wed Feb 28 10:30:20 UTC 2018
Modified Files:
src/sys/netinet: ip_encap.h
src/sys/sys: mbuf.h
Log Message:
Remove unused mbuf tags.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/netinet/ip_encap.h
cvs rdiff -u -r1.177 -r1.178 src/sys/sys/mbuf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_encap.h
diff -u src/sys/netinet/ip_encap.h:1.23 src/sys/netinet/ip_encap.h:1.24
--- src/sys/netinet/ip_encap.h:1.23 Wed Nov 15 10:42:41 2017
+++ src/sys/netinet/ip_encap.h Wed Feb 28 10:30:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_encap.h,v 1.23 2017/11/15 10:42:41 knakahara Exp $ */
+/* $NetBSD: ip_encap.h,v 1.24 2018/02/28 10:30:20 maxv Exp $ */
/* $KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $ */
/*
@@ -75,7 +75,7 @@ struct encaptab {
struct sockaddr *dstmask;
int (*func) (struct mbuf *, int, int, void *);
const struct encapsw *esw;
- void *arg; /* passed via PACKET_TAG_ENCAP */
+ void *arg;
struct psref_target psref;
};
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.177 src/sys/sys/mbuf.h:1.178
--- src/sys/sys/mbuf.h:1.177 Tue Feb 27 14:28:01 2018
+++ src/sys/sys/mbuf.h Wed Feb 28 10:30:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.177 2018/02/27 14:28:01 maxv Exp $ */
+/* $NetBSD: mbuf.h,v 1.178 2018/02/28 10:30:20 maxv Exp $ */
/*
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -899,32 +899,16 @@ struct m_tag *m_tag_next(struct mbuf *,
/* Packet tag types */
#define PACKET_TAG_NONE 0 /* Nothing */
- /* 1: Used to be VLAN ID */
-#define PACKET_TAG_ENCAP 2 /* encapsulation data */
-#define PACKET_TAG_ESP 3 /* ESP information */
#define PACKET_TAG_SO 4 /* sending socket pointer */
#define PACKET_TAG_PF 11 /* packet filter */
#define PACKET_TAG_ALTQ_QID 12 /* ALTQ queue id */
-
-#define PACKET_TAG_IPSEC_IN_CRYPTO_DONE 16
-#define PACKET_TAG_IPSEC_IN_DONE 17
#define PACKET_TAG_IPSEC_OUT_DONE 18
-#define PACKET_TAG_IPSEC_OUT_CRYPTO_NEEDED 19 /* NIC IPsec crypto req'ed */
-#define PACKET_TAG_IPSEC_IN_COULD_DO_CRYPTO 20 /* NIC notifies IPsec */
-#define PACKET_TAG_IPSEC_PENDING_TDB 21 /* Reminder to do IPsec */
-
-#define PACKET_TAG_IPSEC_SOCKET 22 /* IPSEC socket ref */
-#define PACKET_TAG_IPSEC_HISTORY 23 /* IPSEC history */
-
#define PACKET_TAG_IPSEC_NAT_T_PORTS 25 /* two uint16_t */
-
#define PACKET_TAG_INET6 26 /* IPv6 info */
-
#define PACKET_TAG_TUNNEL_INFO 28 /* tunnel identification and
* protocol callback, for
* loop detection/recovery
*/
-
#define PACKET_TAG_MPLS 29 /* Indicate it's for MPLS */
#define PACKET_TAG_SRCROUTE 30 /* IPv4 source routing */
