Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mroute*: Make mr_table a common struct 



Following previous changes to ip6mr, mr_table and mr6_table are
basically the same [up to mr6_table having additional '6' suffixes to
its variable names].
Move the common structure definition into a common header; This
requires renaming all references in ip6mr to variables that had the
distinct suffix.

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 87c418bf

include/linux/mroute.h

+0 −21
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 


#include <linux/in.h>

#include <linux/pim.h>

#include <linux/rhashtable.h>

#include <net/sock.h>

#include <net/fib_rules.h>

#include <net/fib_notifier.h>

#include <uapi/linux/mroute.h>
@@ -67,25 +65,6 @@ struct vif_entry_notifier_info { 


#define VIFF_STATIC 0x8000



#define VIF_EXISTS(_mrt, _idx) ((_mrt)->vif_table[_idx].dev != NULL)



struct mr_table {

	struct list_head	list;

	possible_net_t		net;

	u32			id;

	struct sock __rcu	*mroute_sk;

	struct timer_list	ipmr_expire_timer;

	struct list_head	mfc_unres_queue;

	struct vif_device	vif_table[MAXVIFS];

	struct rhltable		mfc_hash;

	struct list_head	mfc_cache_list;

	int			maxvif;

	atomic_t		cache_resolve_queue_len;

	bool			mroute_do_assert;

	bool			mroute_do_pim;

	int			mroute_reg_vif_num;

};



/* mfc_flags:

 * MFC_STATIC - the entry was added statically (not by a routing daemon)

 * MFC_OFFLOAD - the entry was offloaded to the hardware

include/linux/mroute6.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <net/net_namespace.h>

#include <uapi/linux/mroute6.h>

#include <linux/mroute_base.h>

#include <linux/rhashtable.h>



#ifdef CONFIG_IPV6_MROUTE

static inline int ip6_mroute_opt(int opt)

include/linux/mroute_base.h

+46 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
#define __LINUX_MROUTE_BASE_H



#include <linux/netdevice.h>

#include <linux/rhashtable.h>

#include <net/net_namespace.h>

#include <net/sock.h>



/**

 * struct vif_device - interface representor for multicast routing
@@ -32,6 +35,49 @@ struct vif_device { 
	__be32 local, remote;

};



#ifndef MAXVIFS

/* This one is nasty; value is defined in uapi using different symbols for

 * mroute and morute6 but both map into same 32.

 */

#define MAXVIFS	32

#endif



#define VIF_EXISTS(_mrt, _idx) (!!((_mrt)->vif_table[_idx].dev))



/**

 * struct mr_table - a multicast routing table

 * @list: entry within a list of multicast routing tables

 * @net: net where this table belongs

 * @id: identifier of the table

 * @mroute_sk: socket associated with the table

 * @ipmr_expire_timer: timer for handling unresolved routes

 * @mfc_unres_queue: list of unresolved MFC entries

 * @vif_table: array containing all possible vifs

 * @mfc_hash: Hash table of all resolved routes for easy lookup

 * @mfc_cache_list: list of resovled routes for possible traversal

 * @maxvif: Identifier of highest value vif currently in use

 * @cache_resolve_queue_len: current size of unresolved queue

 * @mroute_do_assert: Whether to inform userspace on wrong ingress

 * @mroute_do_pim: Whether to receive IGMP PIMv1

 * @mroute_reg_vif_num: PIM-device vif index

 */

struct mr_table {

	struct list_head	list;

	possible_net_t		net;

	u32			id;

	struct sock __rcu	*mroute_sk;

	struct timer_list	ipmr_expire_timer;

	struct list_head	mfc_unres_queue;

	struct vif_device	vif_table[MAXVIFS];

	struct rhltable		mfc_hash;

	struct list_head	mfc_cache_list;

	int			maxvif;

	atomic_t		cache_resolve_queue_len;

	bool			mroute_do_assert;

	bool			mroute_do_pim;

	int			mroute_reg_vif_num;

};



#ifdef CONFIG_IP_MROUTE_COMMON

void vif_device_init(struct vif_device *v,

		     struct net_device *dev,

include/net/netns/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct netns_ipv6 { 
	struct sock		*mc_autojoin_sk;

#ifdef CONFIG_IPV6_MROUTE

#ifndef CONFIG_IPV6_MROUTE_MULTIPLE_TABLES

	struct mr6_table	*mrt6;

	struct mr_table		*mrt6;

#else

	struct list_head	mr6_tables;

	struct fib_rules_ops	*mr6_rules_ops;

net/ipv4/ipmr.c

+0 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/cache.h>

#include <linux/capability.h>

#include <linux/errno.h>

#include <linux/timer.h>

#include <linux/mm.h>

#include <linux/kernel.h>

#include <linux/fcntl.h>
@@ -53,7 +52,6 @@ 
#include <net/protocol.h>

#include <linux/skbuff.h>

#include <net/route.h>

#include <net/sock.h>

#include <net/icmp.h>

#include <net/udp.h>

#include <net/raw.h>