From 2001d48188eb9b576db1293c490798e33fa4aa14 Mon Sep 17 00:00:00 2001
From: Holger Eitzenberger <holger@eitzenberger.org>
Date: Tue, 9 Dec 2008 23:08:09 -0800
Subject: [PATCH] --- yaml --- r: 122567 b: refs/heads/master c:
 77afc92b7915b6bb21584474a429a04603ac8963 h: refs/heads/master i:   122565:
 a4ad67741c9dc5fc67f4bfd9145b569158a122a5   122563:
 5213fef45a56356ad2a41bdc7effa022c4cba114   122559:
 2e4679dd530cbb4147e4a3aa02543891de02ef5d v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/net/bonding/bond_main.c | 30 ++++++++++++---------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 60d5a534fb87..96e7b976607b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58402054264fa33b405d1abcbcd8e528507aac1a
+refs/heads/master: 77afc92b7915b6bb21584474a429a04603ac8963
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
index 16cfe9efee7c..7f2ac499aac2 100644
--- a/trunk/drivers/net/bonding/bond_main.c
+++ b/trunk/drivers/net/bonding/bond_main.c
@@ -219,24 +219,20 @@ static void bond_deinit(struct net_device *bond_dev);
 
 static const char *bond_mode_name(int mode)
 {
-	switch (mode) {
-	case BOND_MODE_ROUNDROBIN :
-		return "load balancing (round-robin)";
-	case BOND_MODE_ACTIVEBACKUP :
-		return "fault-tolerance (active-backup)";
-	case BOND_MODE_XOR :
-		return "load balancing (xor)";
-	case BOND_MODE_BROADCAST :
-		return "fault-tolerance (broadcast)";
-	case BOND_MODE_8023AD:
-		return "IEEE 802.3ad Dynamic link aggregation";
-	case BOND_MODE_TLB:
-		return "transmit load balancing";
-	case BOND_MODE_ALB:
-		return "adaptive load balancing";
-	default:
+	static const char *names[] = {
+		[BOND_MODE_ROUNDROBIN] = "load balancing (round-robin)",
+		[BOND_MODE_ACTIVEBACKUP] = "fault-tolerance (active-backup)",
+		[BOND_MODE_XOR] = "load balancing (xor)",
+		[BOND_MODE_BROADCAST] = "fault-tolerance (broadcast)",
+		[BOND_MODE_8023AD]= "IEEE 802.3ad Dynamic link aggregation",
+		[BOND_MODE_TLB] = "transmit load balancing",
+		[BOND_MODE_ALB] = "adaptive load balancing",
+	};
+
+	if (mode < 0 || mode > BOND_MODE_ALB)
 		return "unknown";
-	}
+
+	return names[mode];
 }
 
 /*---------------------------------- VLAN -----------------------------------*/