Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

YOSHIFUJI Hideaki and committed by
David S. Miller
0686caa3 e6da97e7

+9 -5
+4
include/net/ndisc.h
··· 129 129 void __user *buffer, 130 130 size_t *lenp, 131 131 loff_t *ppos); 132 + int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name, 133 + int nlen, void __user *oldval, 134 + size_t __user *oldlenp, 135 + void __user *newval, size_t newlen); 132 136 #endif 133 137 134 138 extern void inet6_ifinfo_notify(int event,
+1 -1
net/ipv6/addrconf.c
··· 4242 4242 neigh_sysctl_register(idev->dev, idev->nd_parms, NET_IPV6, 4243 4243 NET_IPV6_NEIGH, "ipv6", 4244 4244 &ndisc_ifinfo_sysctl_change, 4245 - NULL); 4245 + ndisc_ifinfo_sysctl_strategy); 4246 4246 __addrconf_sysctl_register(dev_net(idev->dev), idev->dev->name, 4247 4247 idev->dev->ifindex, idev, &idev->cnf); 4248 4248 }
+4 -4
net/ipv6/ndisc.c
··· 1727 1727 return ret; 1728 1728 } 1729 1729 1730 - static int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name, 1731 - int nlen, void __user *oldval, 1732 - size_t __user *oldlenp, 1733 - void __user *newval, size_t newlen) 1730 + int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name, 1731 + int nlen, void __user *oldval, 1732 + size_t __user *oldlenp, 1733 + void __user *newval, size_t newlen) 1734 1734 { 1735 1735 struct net_device *dev = ctl->extra1; 1736 1736 struct inet6_dev *idev;