From: "Maciej Żenczykowski" <zenczykowski@gmail.com>
To: "Maciej Żenczykowski" <maze@google.com>,
"David S . Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Erik Kline <ek@google.com>,
Lorenzo Colitti <lorenzo@google.com>
Subject: [PATCH 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited
Date: Sat, 24 Sep 2016 09:05:05 -0700 [thread overview]
Message-ID: <1474733109-18355-3-git-send-email-zenczykowski@gmail.com> (raw)
In-Reply-To: <1474733109-18355-1-git-send-email-zenczykowski@gmail.com>
From: Maciej Żenczykowski <maze@google.com>
This allows setting /proc/sys/net/ipv6/conf/*/router_solicitations
to -1 meaning an unlimited number of retransmits.
Signed-off-by: Maciej Żenczykowski <maze@google.com>
---
net/ipv6/addrconf.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 3a835495fb53..6c63bf06fbcf 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3687,7 +3687,7 @@ static void addrconf_rs_timer(unsigned long data)
if (idev->if_flags & IF_RA_RCVD)
goto out;
- if (idev->rs_probes++ < idev->cnf.rtr_solicits) {
+ if (idev->rs_probes++ < idev->cnf.rtr_solicits || idev->cnf.rtr_solicits == -1) {
write_unlock(&idev->lock);
if (!ipv6_get_lladdr(dev, &lladdr, IFA_F_TENTATIVE))
ndisc_send_rs(dev, &lladdr,
@@ -3949,7 +3949,7 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp)
send_mld = ifp->scope == IFA_LINK && ipv6_lonely_lladdr(ifp);
send_rs = send_mld &&
ipv6_accept_ra(ifp->idev) &&
- ifp->idev->cnf.rtr_solicits > 0 &&
+ ifp->idev->cnf.rtr_solicits != 0 &&
(dev->flags&IFF_LOOPBACK) == 0;
read_unlock_bh(&ifp->idev->lock);
@@ -5099,7 +5099,7 @@ static int inet6_set_iftoken(struct inet6_dev *idev, struct in6_addr *token)
return -EINVAL;
if (!ipv6_accept_ra(idev))
return -EINVAL;
- if (idev->cnf.rtr_solicits <= 0)
+ if (idev->cnf.rtr_solicits == 0)
return -EINVAL;
write_lock_bh(&idev->lock);
@@ -5699,6 +5699,7 @@ int addrconf_sysctl_ignore_routes_with_linkdown(struct ctl_table *ctl,
return ret;
}
+static int minus_one = -1;
static int one = 1;
static int two_five_five = 255;
@@ -5759,7 +5760,8 @@ static const struct ctl_table addrconf_sysctl[] = {
.data = &ipv6_devconf.rtr_solicits,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = proc_dointvec,
+ .proc_handler = proc_dointvec_minmax,
+ .extra1 = &minus_one,
},
{
.procname = "router_solicitation_interval",
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-09-24 16:06 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-24 16:01 Implement rfc7559 ipv6 router solicitation backoff Maciej Żenczykowski
2016-09-24 16:05 ` [PATCH 1/7] ipv6 addrconf: enable use of proc_dointvec_minmax in addrconf_sysctl Maciej Żenczykowski
2016-09-24 16:05 ` [PATCH 2/7] ipv6 addrconf: remove addrconf_sysctl_hop_limit() Maciej Żenczykowski
2016-09-24 16:05 ` Maciej Żenczykowski [this message]
2016-09-24 16:05 ` [PATCH 4/7] ipv6 addrconf: add new sysctl 'router_solicitation_max_interval' Maciej Żenczykowski
2016-09-24 16:05 ` [PATCH 5/7] ipv6 addrconf: implement RFC7559 router solicitation backoff Maciej Żenczykowski
2016-09-25 2:14 ` Maciej Żenczykowski
2016-09-25 2:14 ` [PATCH] " Maciej Żenczykowski
2016-09-25 9:33 ` David Miller
2016-09-25 9:59 ` [PATCH v2 1/7] ipv6 addrconf: enable use of proc_dointvec_minmax in addrconf_sysctl Maciej Żenczykowski
2016-09-25 9:59 ` [PATCH v2 2/7] ipv6 addrconf: remove addrconf_sysctl_hop_limit() Maciej Żenczykowski
2016-09-25 9:59 ` [PATCH v2 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited Maciej Żenczykowski
2016-09-26 15:34 ` Lorenzo Colitti
2016-09-27 2:23 ` Maciej Żenczykowski
2016-09-27 2:25 ` Erik Kline
2016-09-25 9:59 ` [PATCH v2 4/7] ipv6 addrconf: add new sysctl 'router_solicitation_max_interval' Maciej Żenczykowski
2016-09-25 9:59 ` [PATCH v2 5/7] ipv6 addrconf: implement RFC7559 router solicitation backoff Maciej Żenczykowski
2016-09-25 9:59 ` [PATCH v2 6/7] ipv6 addrconf: change default RTR_SOLICITATION_MAX_INTERVAL from 4s to 1h Maciej Żenczykowski
2016-09-25 9:59 ` [PATCH v2 7/7] ipv6 addrconf: change default MAX_RTR_SOLICITATIONS from 3 to -1 (unlimited) Maciej Żenczykowski
2016-09-25 10:04 ` [PATCH v2 1/7] ipv6 addrconf: enable use of proc_dointvec_minmax in addrconf_sysctl David Miller
2016-09-25 10:52 ` (unknown), Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 1/7] ipv6 addrconf: enable use of proc_dointvec_minmax in addrconf_sysctl Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 2/7] ipv6 addrconf: remove addrconf_sysctl_hop_limit() Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 4/7] ipv6 addrconf: add new sysctl 'router_solicitation_max_interval' Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 5/7] ipv6 addrconf: implement RFC7559 router solicitation backoff Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 6/7] ipv6 addrconf: change default RTR_SOLICITATION_MAX_INTERVAL from 4s to 1h Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 7/7] ipv6 addrconf: change default MAX_RTR_SOLICITATIONS from 3 to -1 (unlimited) Maciej Żenczykowski
2016-09-25 12:51 ` (unknown) David Miller
2016-09-25 11:03 ` [PATCH v4 0/7] implement rfc7559 ipv6 router solicitation backoff Maciej Żenczykowski
2016-09-25 11:03 ` [PATCH v4 1/7] ipv6 addrconf: enable use of proc_dointvec_minmax in addrconf_sysctl Maciej Żenczykowski
2016-09-26 9:13 ` Erik Kline
2016-09-25 11:03 ` [PATCH v4 2/7] ipv6 addrconf: remove addrconf_sysctl_hop_limit() Maciej Żenczykowski
2016-09-26 9:14 ` Erik Kline
2016-09-26 9:37 ` Maciej Żenczykowski
2016-09-25 11:03 ` [PATCH v4 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited Maciej Żenczykowski
2016-09-26 9:23 ` Erik Kline
2016-09-25 11:03 ` [PATCH v4 4/7] ipv6 addrconf: add new sysctl 'router_solicitation_max_interval' Maciej Żenczykowski
2016-09-26 9:29 ` Erik Kline
2016-09-26 13:59 ` Hannes Frederic Sowa
2016-09-27 2:30 ` Maciej Żenczykowski
2016-09-27 9:49 ` Hannes Frederic Sowa
2016-09-27 10:08 ` Maciej Żenczykowski
2016-09-25 11:03 ` [PATCH v4 5/7] ipv6 addrconf: implement RFC7559 router solicitation backoff Maciej Żenczykowski
2016-09-26 13:53 ` Hannes Frederic Sowa
2016-09-27 9:42 ` Maciej Żenczykowski
2016-09-27 9:52 ` [PATCH v5 0/7] implement rfc7559 ipv6 " Maciej Żenczykowski
2016-09-27 9:52 ` [PATCH v5 1/7] ipv6 addrconf: enable use of proc_dointvec_minmax in addrconf_sysctl Maciej Żenczykowski
2016-09-27 10:16 ` YOSHIFUJI Hideaki
2016-09-27 9:52 ` [PATCH v5 2/7] ipv6 addrconf: remove addrconf_sysctl_hop_limit() Maciej Żenczykowski
2016-09-27 10:18 ` YOSHIFUJI Hideaki
2016-09-27 9:52 ` [PATCH v5 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited Maciej Żenczykowski
2016-09-27 10:20 ` YOSHIFUJI Hideaki
2016-09-27 10:39 ` Maciej Żenczykowski
2016-09-27 9:52 ` [PATCH v5 4/7] ipv6 addrconf: add new sysctl 'router_solicitation_max_interval' Maciej Żenczykowski
2016-09-27 9:52 ` [PATCH v5 5/7] ipv6 addrconf: implement RFC7559 router solicitation backoff Maciej Żenczykowski
2016-09-27 9:52 ` [PATCH v5 6/7] ipv6 addrconf: change default RTR_SOLICITATION_MAX_INTERVAL from 4s to 1h Maciej Żenczykowski
2016-09-27 9:52 ` [PATCH v5 7/7] ipv6 addrconf: change default MAX_RTR_SOLICITATIONS from 3 to -1 (unlimited) Maciej Żenczykowski
2016-09-27 9:58 ` [PATCH v4 5/7] ipv6 addrconf: implement RFC7559 router solicitation backoff Hannes Frederic Sowa
2016-09-27 10:20 ` Hannes Frederic Sowa
2016-09-25 11:03 ` [PATCH v4 6/7] ipv6 addrconf: change default RTR_SOLICITATION_MAX_INTERVAL from 4s to 1h Maciej Żenczykowski
2016-09-25 11:03 ` [PATCH v4 7/7] ipv6 addrconf: change default MAX_RTR_SOLICITATIONS from 3 to -1 (unlimited) Maciej Żenczykowski
2016-09-24 16:05 ` [PATCH 6/7] ipv6 addrconf: change default RTR_SOLICITATION_MAX_INTERVAL from 4s to 1h Maciej Żenczykowski
2016-09-24 16:05 ` [PATCH 7/7] ipv6 addrconf: change default MAX_RTR_SOLICITATIONS from 3 to -1 (unlimited) Maciej Żenczykowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474733109-18355-3-git-send-email-zenczykowski@gmail.com \
--to=zenczykowski@gmail.com \
--cc=davem@davemloft.net \
--cc=ek@google.com \
--cc=lorenzo@google.com \
--cc=maze@google.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).