Merging upstream version 10.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 0 insertions, 359 deletions

diff --git a/include/linux/mroute.h b/include/linux/mroute.h
deleted file mode 100644
index a0bfdcb..0000000
--- a/include/linux/mroute.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _UAPI__LINUX_MROUTE_H
-#define _UAPI__LINUX_MROUTE_H
-
-#ifdef __LINUX__
-#include <linux/sockios.h>
-#include <linux/types.h>
-#endif
-#include <netinet/in.h>		/* For struct in_addr. */
-
-/* Based on the MROUTING 3.5 defines primarily to keep
- * source compatibility with BSD.
- *
- * See the mrouted code for the original history.
- *
- * Protocol Independent Multicast (PIM) data structures included
- * Carlos Picoto (cap@di.fc.ul.pt)
- */
-
-#define MRT_BASE	200
-#define MRT_INIT	(MRT_BASE)	/* Activate the kernel mroute code 	*/
-#define MRT_DONE	(MRT_BASE+1)	/* Shutdown the kernel mroute		*/
-#define MRT_ADD_VIF	(MRT_BASE+2)	/* Add a virtual interface		*/
-#define MRT_DEL_VIF	(MRT_BASE+3)	/* Delete a virtual interface		*/
-#define MRT_ADD_MFC	(MRT_BASE+4)	/* Add a multicast forwarding entry	*/
-#define MRT_DEL_MFC	(MRT_BASE+5)	/* Delete a multicast forwarding entry	*/
-#define MRT_VERSION	(MRT_BASE+6)	/* Get the kernel multicast version	*/
-#define MRT_ASSERT	(MRT_BASE+7)	/* Activate PIM assert mode		*/
-#define MRT_PIM		(MRT_BASE+8)	/* enable PIM code			*/
-#define MRT_TABLE	(MRT_BASE+9)	/* Specify mroute table ID		*/
-#define MRT_ADD_MFC_PROXY	(MRT_BASE+10)	/* Add a (*,*|G) mfc entry	*/
-#define MRT_DEL_MFC_PROXY	(MRT_BASE+11)	/* Del a (*,*|G) mfc entry	*/
-#define MRT_FLUSH	(MRT_BASE+12)	/* Flush all mfc entries and/or vifs	*/
-#define MRT_MAX		(MRT_BASE+12)
-
-#ifndef SIOCGETVIFCNT
-#define SIOCGETVIFCNT	SIOCPROTOPRIVATE	/* IP protocol privates */
-#define SIOCGETSGCNT	(SIOCPROTOPRIVATE+1)
-#define SIOCGETRPF	(SIOCPROTOPRIVATE+2)
-#endif
-
-#ifndef MAXVIFS
-#define MAXVIFS 32
-#endif
-/* MRT_FLUSH optional flags */
-#define MRT_FLUSH_MFC	1	/* Flush multicast entries */
-#define MRT_FLUSH_MFC_STATIC	2	/* Flush static multicast entries */
-#define MRT_FLUSH_VIFS	4	/* Flush multicast vifs */
-#define MRT_FLUSH_VIFS_STATIC	8	/* Flush static multicast vifs */
-
-typedef unsigned long vifbitmap_t;	/* User mode code depends on this lot */
-typedef unsigned short vifi_t;
-#define ALL_VIFS	((vifi_t)(-1))
-
-/* Same idea as select */
-
-#define VIFM_SET(n,m)	((m)|=(1<<(n)))
-#define VIFM_CLR(n,m)	((m)&=~(1<<(n)))
-#define VIFM_ISSET(n,m)	((m)&(1<<(n)))
-#define VIFM_CLRALL(m)	((m)=0)
-#define VIFM_COPY(mfrom,mto)	((mto)=(mfrom))
-#define VIFM_SAME(m1,m2)	((m1)==(m2))
-
-/* Passed by mrouted for an MRT_ADD_VIF - again we use the
- * mrouted 3.6 structures for compatibility
- */
-struct vifctl {
-	vifi_t	vifc_vifi;		/* Index of VIF */
-	unsigned char vifc_flags;	/* VIFF_ flags */
-	unsigned char vifc_threshold;	/* ttl limit */
-	unsigned int vifc_rate_limit;	/* Rate limiter values (NI) */
-	union {
-		struct in_addr vifc_lcl_addr;     /* Local interface address */
-		int            vifc_lcl_ifindex;  /* Local interface index   */
-	};
-	struct in_addr vifc_rmt_addr;	/* IPIP tunnel addr */
-};
-
-#define VIFF_TUNNEL		0x1	/* IPIP tunnel */
-#define VIFF_SRCRT		0x2	/* NI */
-#define VIFF_REGISTER		0x4	/* register vif	*/
-#define VIFF_USE_IFINDEX	0x8	/* use vifc_lcl_ifindex instead of
-					   vifc_lcl_addr to find an interface */
-
-/* Cache manipulation structures for mrouted and PIMd */
-struct mfcctl {
-	struct in_addr mfcc_origin;		/* Origin of mcast	*/
-	struct in_addr mfcc_mcastgrp;		/* Group in question	*/
-	vifi_t	mfcc_parent;			/* Where it arrived	*/
-	unsigned char mfcc_ttls[MAXVIFS];	/* Where it is going	*/
-	unsigned int mfcc_pkt_cnt;		/* pkt count for src-grp */
-	unsigned int mfcc_byte_cnt;
-	unsigned int mfcc_wrong_if;
-	int	     mfcc_expire;
-};
-
-/*  Group count retrieval for mrouted */
-struct sioc_sg_req {
-	struct in_addr src;
-	struct in_addr grp;
-	unsigned long pktcnt;
-	unsigned long bytecnt;
-	unsigned long wrong_if;
-};
-
-/* To get vif packet counts */
-struct sioc_vif_req {
-	vifi_t	vifi;		/* Which iface */
-	unsigned long icount;	/* In packets */
-	unsigned long ocount;	/* Out packets */
-	unsigned long ibytes;	/* In bytes */
-	unsigned long obytes;	/* Out bytes */
-};
-
-/* This is the format the mroute daemon expects to see IGMP control
- * data. Magically happens to be like an IP packet as per the original
- */
-struct igmpmsg {
-	uint32_t unused1,unused2;
-	unsigned char im_msgtype;		/* What is this */
-	unsigned char im_mbz;			/* Must be zero */
-	unsigned char im_vif;			/* Low 8 bits of Interface */
-	unsigned char im_vif_hi;		/* High 8 bits of Interface */
-	struct in_addr im_src,im_dst;
-};
-
-/* ipmr netlink table attributes */
-enum {
-	IPMRA_TABLE_UNSPEC,
-	IPMRA_TABLE_ID,
-	IPMRA_TABLE_CACHE_RES_QUEUE_LEN,
-	IPMRA_TABLE_MROUTE_REG_VIF_NUM,
-	IPMRA_TABLE_MROUTE_DO_ASSERT,
-	IPMRA_TABLE_MROUTE_DO_PIM,
-	IPMRA_TABLE_VIFS,
-	IPMRA_TABLE_MROUTE_DO_WRVIFWHOLE,
-	__IPMRA_TABLE_MAX
-};
-#define IPMRA_TABLE_MAX (__IPMRA_TABLE_MAX - 1)
-
-/* ipmr netlink vif attribute format
- * [ IPMRA_TABLE_VIFS ] - nested attribute
- *   [ IPMRA_VIF ] - nested attribute
- *     [ IPMRA_VIFA_xxx ]
- */
-enum {
-	IPMRA_VIF_UNSPEC,
-	IPMRA_VIF,
-	__IPMRA_VIF_MAX
-};
-#define IPMRA_VIF_MAX (__IPMRA_VIF_MAX - 1)
-
-/* vif-specific attributes */
-enum {
-	IPMRA_VIFA_UNSPEC,
-	IPMRA_VIFA_IFINDEX,
-	IPMRA_VIFA_VIF_ID,
-	IPMRA_VIFA_FLAGS,
-	IPMRA_VIFA_BYTES_IN,
-	IPMRA_VIFA_BYTES_OUT,
-	IPMRA_VIFA_PACKETS_IN,
-	IPMRA_VIFA_PACKETS_OUT,
-	IPMRA_VIFA_LOCAL_ADDR,
-	IPMRA_VIFA_REMOTE_ADDR,
-	IPMRA_VIFA_PAD,
-	__IPMRA_VIFA_MAX
-};
-#define IPMRA_VIFA_MAX (__IPMRA_VIFA_MAX - 1)
-
-/* ipmr netlink cache report attributes */
-enum {
-	IPMRA_CREPORT_UNSPEC,
-	IPMRA_CREPORT_MSGTYPE,
-	IPMRA_CREPORT_VIF_ID,
-	IPMRA_CREPORT_SRC_ADDR,
-	IPMRA_CREPORT_DST_ADDR,
-	IPMRA_CREPORT_PKT,
-	IPMRA_CREPORT_TABLE,
-	__IPMRA_CREPORT_MAX
-};
-#define IPMRA_CREPORT_MAX (__IPMRA_CREPORT_MAX - 1)
-
-/* That's all usermode folks */
-
-#define MFC_ASSERT_THRESH (3*HZ)		/* Maximal freq. of asserts */
-
-/* Pseudo messages used by mrouted */
-#define IGMPMSG_NOCACHE		1		/* Kern cache fill request to mrouted */
-#define IGMPMSG_WRONGVIF	2		/* For PIM assert processing (unused) */
-#define IGMPMSG_WHOLEPKT	3		/* For PIM Register processing */
-#define IGMPMSG_WRVIFWHOLE	4		/* For PIM Register and assert processing */
-
-#endif /* _UAPI__LINUX_MROUTE_H */
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
deleted file mode 100644
index 8c06406..0000000
--- a/include/linux/mroute6.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _UAPI__LINUX_MROUTE6_H
-#define _UAPI__LINUX_MROUTE6_H
-
-#ifdef __LINUX__
-#include <linux/const.h>
-#include <linux/types.h>
-#include <linux/sockios.h>
-#endif
-#include <netinet/in.h>		/* For struct sockaddr_in6. */
-
-/*
- *	Based on the MROUTING 3.5 defines primarily to keep
- *	source compatibility with BSD.
- *
- *	See the pim6sd code for the original history.
- *
- *      Protocol Independent Multicast (PIM) data structures included
- *      Carlos Picoto (cap@di.fc.ul.pt)
- *
- */
-
-#define MRT6_BASE	200
-#define MRT6_INIT	(MRT6_BASE)	/* Activate the kernel mroute code 	*/
-#define MRT6_DONE	(MRT6_BASE+1)	/* Shutdown the kernel mroute		*/
-#define MRT6_ADD_MIF	(MRT6_BASE+2)	/* Add a virtual interface		*/
-#define MRT6_DEL_MIF	(MRT6_BASE+3)	/* Delete a virtual interface		*/
-#define MRT6_ADD_MFC	(MRT6_BASE+4)	/* Add a multicast forwarding entry	*/
-#define MRT6_DEL_MFC	(MRT6_BASE+5)	/* Delete a multicast forwarding entry	*/
-#define MRT6_VERSION	(MRT6_BASE+6)	/* Get the kernel multicast version	*/
-#define MRT6_ASSERT	(MRT6_BASE+7)	/* Activate PIM assert mode		*/
-#define MRT6_PIM	(MRT6_BASE+8)	/* enable PIM code			*/
-#define MRT6_TABLE	(MRT6_BASE+9)	/* Specify mroute table ID		*/
-#define MRT6_ADD_MFC_PROXY	(MRT6_BASE+10)	/* Add a (*,*|G) mfc entry	*/
-#define MRT6_DEL_MFC_PROXY	(MRT6_BASE+11)	/* Del a (*,*|G) mfc entry	*/
-#define MRT6_FLUSH	(MRT6_BASE+12)	/* Flush all mfc entries and/or vifs	*/
-#define MRT6_MAX	(MRT6_BASE+12)
-
-#ifndef SIOCGETMIFCNT_IN6
-#define SIOCGETMIFCNT_IN6	SIOCPROTOPRIVATE	/* IP protocol privates */
-#define SIOCGETSGCNT_IN6	(SIOCPROTOPRIVATE+1)
-#define SIOCGETRPF	(SIOCPROTOPRIVATE+2)
-#endif
-
-#ifndef MAXMIFS
-#define MAXMIFS 32
-#endif
-/* MRT6_FLUSH optional flags */
-#define MRT6_FLUSH_MFC	1	/* Flush multicast entries */
-#define MRT6_FLUSH_MFC_STATIC	2	/* Flush static multicast entries */
-#define MRT6_FLUSH_MIFS	4	/* Flushing multicast vifs */
-#define MRT6_FLUSH_MIFS_STATIC	8	/* Flush static multicast vifs */
-
-typedef unsigned long mifbitmap_t;	/* User mode code depends on this lot */
-typedef unsigned short mifi_t;
-#define ALL_MIFS	((mifi_t)(-1))
-
-#ifndef IF_SETSIZE
-#define IF_SETSIZE	256
-#endif
-
-typedef	uint32_t	if_mask;
-#define NIFBITS (sizeof(if_mask) * 8)        /* bits per mask */
-
-typedef struct if_set {
-	/* __KERNEL_DIV_ROUND_UP() */
-	if_mask ifs_bits[(IF_SETSIZE + NIFBITS - 1) / NIFBITS];
-} if_set;
-
-#define IF_SET(n, p)    ((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS)))
-#define IF_CLR(n, p)    ((p)->ifs_bits[(n)/NIFBITS] &= ~(1 << ((n) % NIFBITS)))
-#define IF_ISSET(n, p)  ((p)->ifs_bits[(n)/NIFBITS] & (1 << ((n) % NIFBITS)))
-#define IF_COPY(f, t)   bcopy(f, t, sizeof(*(f)))
-#define IF_ZERO(p)      bzero(p, sizeof(*(p)))
-
-/*
- *	Passed by mrouted for an MRT_ADD_MIF - again we use the
- *	mrouted 3.6 structures for compatibility
- */
-
-struct mif6ctl {
-	mifi_t	mif6c_mifi;		/* Index of MIF */
-	unsigned char mif6c_flags;	/* MIFF_ flags */
-	unsigned char vifc_threshold;	/* ttl limit */
-	__u16	 mif6c_pifi;		/* the index of the physical IF */
-	unsigned int vifc_rate_limit;	/* Rate limiter values (NI) */
-};
-
-#define MIFF_REGISTER	0x1	/* register vif	*/
-
-/*
- *	Cache manipulation structures for mrouted and PIMd
- */
-
-struct mf6cctl {
-	struct sockaddr_in6 mf6cc_origin;		/* Origin of mcast	*/
-	struct sockaddr_in6 mf6cc_mcastgrp;		/* Group in question	*/
-	mifi_t	mf6cc_parent;			/* Where it arrived	*/
-	struct if_set mf6cc_ifset;		/* Where it is going */
-};
-
-/*
- *	Group count retrieval for pim6sd
- */
-
-struct sioc_sg_req6 {
-	struct sockaddr_in6 src;
-	struct sockaddr_in6 grp;
-	unsigned long pktcnt;
-	unsigned long bytecnt;
-	unsigned long wrong_if;
-};
-
-/*
- *	To get vif packet counts
- */
-
-struct sioc_mif_req6 {
-	mifi_t	mifi;		/* Which iface */
-	unsigned long icount;	/* In packets */
-	unsigned long ocount;	/* Out packets */
-	unsigned long ibytes;	/* In bytes */
-	unsigned long obytes;	/* Out bytes */
-};
-
-/*
- *	That's all usermode folks
- */
-
-
-
-/*
- * Structure used to communicate from kernel to multicast router.
- * We'll overlay the structure onto an MLD header (not an IPv6 heder like igmpmsg{}
- * used for IPv4 implementation). This is because this structure will be passed via an
- * IPv6 raw socket, on which an application will only receiver the payload i.e the data after
- * the IPv6 header and all the extension headers. (See section 3 of RFC 3542)
- */
-
-struct mrt6msg {
-#define MRT6MSG_NOCACHE		1
-#define MRT6MSG_WRONGMIF	2
-#define MRT6MSG_WHOLEPKT	3		/* used for use level encap */
-#define MRT6MSG_WRMIFWHOLE	4		/* For PIM Register and assert processing */
-	__u8		im6_mbz;		/* must be zero		   */
-	__u8		im6_msgtype;		/* what type of message    */
-	__u16		im6_mif;		/* mif rec'd on		   */
-	__u32		im6_pad;		/* padding for 64 bit arch */
-	struct in6_addr	im6_src, im6_dst;
-};
-
-/* ip6mr netlink cache report attributes */
-enum {
-	IP6MRA_CREPORT_UNSPEC,
-	IP6MRA_CREPORT_MSGTYPE,
-	IP6MRA_CREPORT_MIF_ID,
-	IP6MRA_CREPORT_SRC_ADDR,
-	IP6MRA_CREPORT_DST_ADDR,
-	IP6MRA_CREPORT_PKT,
-	__IP6MRA_CREPORT_MAX
-};
-#define IP6MRA_CREPORT_MAX (__IP6MRA_CREPORT_MAX - 1)
-
-#endif /* _UAPI__LINUX_MROUTE6_H */
diff --git a/include/subdir.am b/include/subdir.am
index 4fa88a0..6f07b6b 100644
--- a/include/subdir.am
+++ b/include/subdir.am
@@ -17,7 +17,5 @@ noinst_HEADERS += \
 	include/linux/seg6_hmac.h \
 	include/linux/seg6_iptunnel.h \
 	include/linux/seg6_local.h \
-	include/linux/mroute.h \
-	include/linux/mroute6.h \
 	include/linux/pkt_cls.h \
 	# end