From fd48be9e4f0971a42bb9e74388e2cf3be12c3434 Mon Sep 17 00:00:00 2001
From: Mark O'Brien <mark@vyatta.com>
Date: Wed, 1 Jul 2009 17:46:14 -0700
Subject: Allow user to select round-robin mode.

* bug 4647
* scripts/vyatta-bonding.pl
(cherry picked from commit aba4e42b4b07b856cbcff0fcf5231824fc18bb37)
---
 scripts/vyatta-bonding.pl | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'scripts/vyatta-bonding.pl')

diff --git a/scripts/vyatta-bonding.pl b/scripts/vyatta-bonding.pl
index 2f2167fa..e2cc627d 100755
--- a/scripts/vyatta-bonding.pl
+++ b/scripts/vyatta-bonding.pl
@@ -36,19 +36,32 @@ use strict;
 use warnings;
 
 my %modes = (
-    "round-robin"           => 0,
-    "active-backup"         => 1,
-    "xor-hash"              => 2,
-    "broadcast"             => 3,
-    "802.3ad"               => 4,
-    "transmit-load-balance" => 5,
-    "adaptive-load-balance" => 6,
+    ## Linux bonding driver modes + 1
+    ## (eg. bond driver expects round-robin = 0)
+    "invalid_opt"           => 0,
+    "round-robin"           => 1,
+    "active-backup"         => 2,
+    "xor-hash"              => 3,
+    "broadcast"             => 4,
+    "802.3ad"               => 5,
+    "transmit-load-balance" => 6,
+    "adaptive-load-balance" => 7,
 );
 
 sub set_mode {
     my ($intf, $mode) = @_;
+    my $request_mode = $mode;
     my $val = $modes{$mode};
-    die "Unknown bonding mode $mode\n" unless $val;
+
+    ## Check if vaild bonding option is requested.
+    foreach my $item ( keys(%modes) ) {
+	$mode = "invalid_opt" unless( $mode =~ m/$item/);
+    };
+    die "Unknown bonding mode $request_mode\n" unless $val;
+
+    ## After above bonding option check, adjust value
+    ##    to value the expected by bonding driver. -MOB
+    $val = ($val - 1);
 
     open my $fm, '>', "/sys/class/net/$intf/bonding/mode"
 	or die "Error: $intf is not a bonding device:$!\n";
-- 
cgit v1.2.3