Commit 73af614a authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

neigh: use tbl->family to distinguish ipv4 from ipv6 



Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb5b09c1

include/net/neighbour.h

+6 −1
Original line number Diff line number Diff line
@@ -202,6 +202,11 @@ struct neigh_table { 
	struct pneigh_entry	**phash_buckets;

};



static inline int neigh_parms_family(struct neigh_parms *p)

{

	return p->tbl->family;

}



#define NEIGH_PRIV_ALIGN	sizeof(long long)

#define NEIGH_ENTRY_SIZE(size)	ALIGN((size), NEIGH_PRIV_ALIGN)
@@ -306,7 +311,7 @@ int neigh_proc_dointvec_ms_jiffies(struct ctl_table *ctl, int write, 
				   size_t *lenp, loff_t *ppos);



int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,

			  char *p_name, proc_handler *proc_handler);

			  proc_handler *proc_handler);

void neigh_sysctl_unregister(struct neigh_parms *p);



static inline void __neigh_parms_put(struct neigh_parms *parms)

net/core/neighbour.c

+13 −1
Original line number Diff line number Diff line
@@ -2947,12 +2947,13 @@ static struct neigh_sysctl_table { 
};



int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,

			  char *p_name, proc_handler *handler)

			  proc_handler *handler)

{

	int i;

	struct neigh_sysctl_table *t;

	const char *dev_name_source;

	char neigh_path[ sizeof("net//neigh/") + IFNAMSIZ + IFNAMSIZ ];

	char *p_name;



	t = kmemdup(&neigh_sysctl_template, sizeof(*t), GFP_KERNEL);

	if (!t)
@@ -2991,6 +2992,17 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, 
	if (neigh_parms_net(p)->user_ns != &init_user_ns)

		t->neigh_vars[0].procname = NULL;



	switch (neigh_parms_family(p)) {

	case AF_INET:

	      p_name = "ipv4";

	      break;

	case AF_INET6:

	      p_name = "ipv6";

	      break;

	default:

	      BUG();

	}



	snprintf(neigh_path, sizeof(neigh_path), "net/%s/neigh/%s",

		p_name, dev_name_source);

	t->sysctl_header =

net/ipv4/arp.c

+1 −1
Original line number Diff line number Diff line
@@ -1287,7 +1287,7 @@ void __init arp_init(void) 
	dev_add_pack(&arp_packet_type);

	arp_proc_init();

#ifdef CONFIG_SYSCTL

	neigh_sysctl_register(NULL, &arp_tbl.parms, "ipv4", NULL);

	neigh_sysctl_register(NULL, &arp_tbl.parms, NULL);

#endif

	register_netdevice_notifier(&arp_netdev_notifier);

}

net/ipv4/devinet.c

+1 −1
Original line number Diff line number Diff line
@@ -2160,7 +2160,7 @@ static void __devinet_sysctl_unregister(struct ipv4_devconf *cnf) 


static void devinet_sysctl_register(struct in_device *idev)

{

	neigh_sysctl_register(idev->dev, idev->arp_parms, "ipv4", NULL);

	neigh_sysctl_register(idev->dev, idev->arp_parms, NULL);

	__devinet_sysctl_register(dev_net(idev->dev), idev->dev->name,

					&idev->cnf);

}

net/ipv6/addrconf.c

+1 −1
Original line number Diff line number Diff line
@@ -5028,7 +5028,7 @@ static void __addrconf_sysctl_unregister(struct ipv6_devconf *p) 


static void addrconf_sysctl_register(struct inet6_dev *idev)

{

	neigh_sysctl_register(idev->dev, idev->nd_parms, "ipv6",

	neigh_sysctl_register(idev->dev, idev->nd_parms,

			      &ndisc_ifinfo_sysctl_change);

	__addrconf_sysctl_register(dev_net(idev->dev), idev->dev->name,

					idev, &idev->cnf);