summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorFlorent Fourcot <florent.fourcot@enst-bretagne.fr>2013-11-07 17:53:13 +0100
committerDavid S. Miller <davem@davemloft.net>2013-11-08 13:43:52 -0500
commit53b47106c0c2b1f42237d255ae272f0fcc3ec413 (patch)
treec44661223011d6119f9d9d3a0b05b9a594f7eccb /net/ipv6
parent3fdfa5ff50aee5b524fb22b6e0e511b73752a257 (diff)
downloadlinux-53b47106c0c2b1f42237d255ae272f0fcc3ec413.tar.gz
linux-53b47106c0c2b1f42237d255ae272f0fcc3ec413.tar.bz2
linux-53b47106c0c2b1f42237d255ae272f0fcc3ec413.zip
ipv6: increase maximum lifetime of flow labels
If the last RFC 6437 does not give any constraints for lifetime of flow labels, the previous RFC 3697 spoke of a minimum of 120 seconds between reattribution of a flow label. The maximum linger is currently set to 60 seconds and does not allow this configuration without CAP_NET_ADMIN right. This patch increase the maximum linger to 150 seconds, allowing more flexibility to standard users. Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ip6_flowlabel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index 4a06ed01d0c3..5f10b0d0bca5 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -41,7 +41,7 @@
#define FL_MIN_LINGER 6 /* Minimal linger. It is set to 6sec specified
in old IPv6 RFC. Well, it was reasonable value.
*/
-#define FL_MAX_LINGER 60 /* Maximal linger timeout */
+#define FL_MAX_LINGER 150 /* Maximal linger timeout */
/* FL hash table */