From e708bc909abb76ae9564c1d133f255a059807c80 Mon Sep 17 00:00:00 2001 From: "Roy.Li" Date: Wed, 28 Sep 2011 19:51:54 +0000 Subject: [PATCH] --- yaml --- r: 264257 b: refs/heads/master c: 605b91c8f619047ed6d88e24c531d4bdddad46f4 h: refs/heads/master i: 264255: 4f6ad5763a8159c51fbebfe39f85a7d66ef23cce v: v3 --- [refs] | 2 +- trunk/Documentation/networking/ip-sysctl.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c45f0106c073..513fac557a35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95de86cf5162f78bc5aea80d1a9e5a248196ffaf +refs/heads/master: 605b91c8f619047ed6d88e24c531d4bdddad46f4 diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt index 81546990f41c..ca5cdcd0f0e3 100644 --- a/trunk/Documentation/networking/ip-sysctl.txt +++ b/trunk/Documentation/networking/ip-sysctl.txt @@ -1042,7 +1042,7 @@ conf/interface/*: The functional behaviour for certain settings is different depending on whether local forwarding is enabled or not. -accept_ra - BOOLEAN +accept_ra - INTEGER Accept Router Advertisements; autoconfigure using them. Possible values are: @@ -1106,7 +1106,7 @@ dad_transmits - INTEGER The amount of Duplicate Address Detection probes to send. Default: 1 -forwarding - BOOLEAN +forwarding - INTEGER Configure interface-specific Host/Router behaviour. Note: It is recommended to have the same setting on all