From bc3f4aac42a34fef3bac9f00d8f4bbdefc5f2641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20de=20Peslo=C3=BCan?= Date: Mon, 26 Dec 2011 13:35:24 +0000 Subject: [PATCH] --- yaml --- r: 279083 b: refs/heads/master c: 1ba9ac7c35b30d6b958a30240e21ddaea8d21b35 h: refs/heads/master i: 279081: 22a4b8b2783e1acf978f779c236ddef8f9ccc020 279079: ac1e567be5db2392f1129a7ac49bc84739d54f97 v: v3 --- [refs] | 2 +- trunk/Documentation/networking/bonding.txt | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 06ca7bff7e3d..73a7a18c431f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c159d30c59dc84934f8ef46f934ce1232c558ecd +refs/heads/master: 1ba9ac7c35b30d6b958a30240e21ddaea8d21b35 diff --git a/trunk/Documentation/networking/bonding.txt b/trunk/Documentation/networking/bonding.txt index 91df678fb7f8..080ad26690ae 100644 --- a/trunk/Documentation/networking/bonding.txt +++ b/trunk/Documentation/networking/bonding.txt @@ -196,6 +196,23 @@ or, for backwards compatibility, the option value. E.g., The parameters are as follows: +active_slave + + Specifies the new active slave for modes that support it + (active-backup, balance-alb and balance-tlb). Possible values + are the name of any currently enslaved interface, or an empty + string. If a name is given, the slave and its link must be up in order + to be selected as the new active slave. If an empty string is + specified, the current active slave is cleared, and a new active + slave is selected automatically. + + Note that this is only available through the sysfs interface. No module + parameter by this name exists. + + The normal value of this option is the name of the currently + active slave, or the empty string if there is no active slave or + the current mode does not use an active slave. + ad_select Specifies the 802.3ad aggregation selection logic to use. The