Commit 6853f21f authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

ipmr,ipmr6: Define a uniform vif_device 



The two implementations have almost identical structures - vif_device and
mif_device. As a step toward uniforming the mr_tables, eliminate the
mif_device and relocate the vif_device definition into a new common
header file.

Also, introduce a common initializing function for setting most of the
vif_device fields in a new common source file. This requires modifying
the ipv{4,6] Kconfig and ipv4 makefile as we're introducing a new common
config option - CONFIG_IP_MROUTE_COMMON.

Signed-off-by: default avatarYuval Mintz <yuvalm@mellanox.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a25724b0

include/linux/mroute.h

+1 −12
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <net/fib_rules.h>

#include <net/fib_notifier.h>

#include <uapi/linux/mroute.h>

#include <linux/mroute_base.h>



#ifdef CONFIG_IP_MROUTE

static inline int ip_mroute_opt(int opt)
@@ -56,18 +57,6 @@ static inline bool ipmr_rule_default(const struct fib_rule *rule) 
}

#endif



struct vif_device {

	struct net_device 	*dev;			/* Device we are using */

	struct netdev_phys_item_id dev_parent_id;	/* Device parent ID    */

	unsigned long	bytes_in,bytes_out;

	unsigned long	pkt_in,pkt_out;		/* Statistics 			*/

	unsigned long	rate_limit;		/* Traffic shaping (NI) 	*/

	unsigned char	threshold;		/* TTL threshold 		*/

	unsigned short	flags;			/* Control flags 		*/

	__be32		local,remote;		/* Addresses(remote for tunnels)*/

	int		link;			/* Physical interface index	*/

};



struct vif_entry_notifier_info {

	struct fib_notifier_info info;

	struct net_device *dev;

include/linux/mroute6.h

+1 −10
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/skbuff.h>	/* for struct sk_buff_head */

#include <net/net_namespace.h>

#include <uapi/linux/mroute6.h>

#include <linux/mroute_base.h>



#ifdef CONFIG_IPV6_MROUTE

static inline int ip6_mroute_opt(int opt)
@@ -62,16 +63,6 @@ static inline void ip6_mr_cleanup(void) 
}

#endif



struct mif_device {

	struct net_device 	*dev;			/* Device we are using */

	unsigned long	bytes_in,bytes_out;

	unsigned long	pkt_in,pkt_out;		/* Statistics 			*/

	unsigned long	rate_limit;		/* Traffic shaping (NI) 	*/

	unsigned char	threshold;		/* TTL threshold 		*/

	unsigned short	flags;			/* Control flags 		*/

	int		link;			/* Physical interface index	*/

};



#define VIFF_STATIC 0x8000



struct mfc6_cache {

include/linux/mroute_base.h

0 → 100644
+52 −0
Original line number Diff line number Diff line 
#ifndef __LINUX_MROUTE_BASE_H

#define __LINUX_MROUTE_BASE_H



#include <linux/netdevice.h>



/**

 * struct vif_device - interface representor for multicast routing

 * @dev: network device being used

 * @bytes_in: statistic; bytes ingressing

 * @bytes_out: statistic; bytes egresing

 * @pkt_in: statistic; packets ingressing

 * @pkt_out: statistic; packets egressing

 * @rate_limit: Traffic shaping (NI)

 * @threshold: TTL threshold

 * @flags: Control flags

 * @link: Physical interface index

 * @dev_parent_id: device parent id

 * @local: Local address

 * @remote: Remote address for tunnels

 */

struct vif_device {

	struct net_device *dev;

	unsigned long bytes_in, bytes_out;

	unsigned long pkt_in, pkt_out;

	unsigned long rate_limit;

	unsigned char threshold;

	unsigned short flags;

	int link;



	/* Currently only used by ipmr */

	struct netdev_phys_item_id dev_parent_id;

	__be32 local, remote;

};



#ifdef CONFIG_IP_MROUTE_COMMON

void vif_device_init(struct vif_device *v,

		     struct net_device *dev,

		     unsigned long rate_limit,

		     unsigned char threshold,

		     unsigned short flags,

		     unsigned short get_iflink_mask);

#else

static inline void vif_device_init(struct vif_device *v,

				   struct net_device *dev,

				   unsigned long rate_limit,

				   unsigned char threshold,

				   unsigned short flags,

				   unsigned short get_iflink_mask)

{

}

#endif

#endif

net/ipv4/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -212,9 +212,14 @@ config NET_IPGRE_BROADCAST 
	  Network), but can be distributed all over the Internet. If you want

	  to do that, say Y here and to "IP multicast routing" below.



config IP_MROUTE_COMMON

	bool

	depends on IP_MROUTE || IPV6_MROUTE



config IP_MROUTE

	bool "IP: multicast routing"

	depends on IP_MULTICAST

	select IP_MROUTE_COMMON

	help

	  This is used if you want your machine to act as a router for IP

	  packets that have several destination addresses. It is needed on the

net/ipv4/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o 
obj-$(CONFIG_PROC_FS) += proc.o

obj-$(CONFIG_IP_MULTIPLE_TABLES) += fib_rules.o

obj-$(CONFIG_IP_MROUTE) += ipmr.o

obj-$(CONFIG_IP_MROUTE_COMMON) += ipmr_base.o

obj-$(CONFIG_NET_IPIP) += ipip.o

gre-y := gre_demux.o

obj-$(CONFIG_NET_FOU) += fou.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE