Commit 3fcd550a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mcast' 



Nicolas Dichtel says:

====================
The goal of this serie is to add the support of proxy multicast, ie being able
to build a static multicast tree. In other words, it adds the support of (*,G)
mf[6]c entries.

v2: use INADDR_ANY instead of 0 for IPv4 addresses
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 202dc3fc 660b26dc

include/linux/mroute.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#ifdef CONFIG_IP_MROUTE

static inline int ip_mroute_opt(int opt)

{

	return (opt >= MRT_BASE) && (opt <= MRT_BASE + 10);

	return (opt >= MRT_BASE) && (opt <= MRT_MAX);

}

#else

static inline int ip_mroute_opt(int opt)

include/linux/mroute6.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#ifdef CONFIG_IPV6_MROUTE

static inline int ip6_mroute_opt(int opt)

{

	return (opt >= MRT6_BASE) && (opt <= MRT6_BASE + 10);

	return (opt >= MRT6_BASE) && (opt <= MRT6_MAX);

}

#else

static inline int ip6_mroute_opt(int opt)

include/uapi/linux/in6.h

+4 −11
Original line number Diff line number Diff line
@@ -259,17 +259,10 @@ struct in6_flowlabel_req { 


/*

 * Multicast Routing:

 * see include/linux/mroute6.h.

 * see include/uapi/linux/mroute6.h.

 *

 * MRT6_INIT			200

 * MRT6_DONE			201

 * MRT6_ADD_MIF			202

 * MRT6_DEL_MIF			203

 * MRT6_ADD_MFC			204

 * MRT6_DEL_MFC			205

 * MRT6_VERSION			206

 * MRT6_ASSERT			207

 * MRT6_PIM			208

 * (reserved)			209

 * MRT6_BASE			200

 * ...

 * MRT6_MAX

 */

#endif /* _UAPI_LINUX_IN6_H */

include/uapi/linux/mroute.h

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
#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_MAX		(MRT_BASE+11)



#define SIOCGETVIFCNT	SIOCPROTOPRIVATE	/* IP protocol privates */

#define SIOCGETSGCNT	(SIOCPROTOPRIVATE+1)

include/uapi/linux/mroute6.h

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
#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_MAX	(MRT6_BASE+11)



#define SIOCGETMIFCNT_IN6	SIOCPROTOPRIVATE	/* IP protocol privates */

#define SIOCGETSGCNT_IN6	(SIOCPROTOPRIVATE+1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE