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

Commit 0686caa3 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

ndisc: Add missing strategies for per-device retrans timer/reachable time settings. 



Noticed from Al Viro <viro@ftp.linux.org.uk> via David Miller
<davem@davemloft.net>.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e6da97e7

include/net/ndisc.h

+4 −0
Original line number Diff line number Diff line
@@ -129,6 +129,10 @@ extern int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, 
							   void __user *buffer,

							   size_t *lenp,

							   loff_t *ppos);

int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name,

				 int nlen, void __user *oldval,

				 size_t __user *oldlenp,

				 void __user *newval, size_t newlen);

#endif



extern void 			inet6_ifinfo_notify(int event,

net/ipv6/addrconf.c

+1 −1
Original line number Diff line number Diff line
@@ -4242,7 +4242,7 @@ static void addrconf_sysctl_register(struct inet6_dev *idev) 
	neigh_sysctl_register(idev->dev, idev->nd_parms, NET_IPV6,

			      NET_IPV6_NEIGH, "ipv6",

			      &ndisc_ifinfo_sysctl_change,

			      NULL);

			      ndisc_ifinfo_sysctl_strategy);

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

			idev->dev->ifindex, idev, &idev->cnf);

}

net/ipv6/ndisc.c

+4 −4
Original line number Diff line number Diff line
@@ -1727,7 +1727,7 @@ int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, struct file * f 
	return ret;

}



static int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name,

int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name,

				 int nlen, void __user *oldval,

				 size_t __user *oldlenp,

				 void __user *newval, size_t newlen)