From patchwork Tue Dec 9 20:07:52 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: holger@eitzenberger.org X-Patchwork-Id: 13037 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 17910DDF5E for ; Wed, 10 Dec 2008 07:15:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754613AbYLIUO4 (ORCPT ); Tue, 9 Dec 2008 15:14:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754585AbYLIUOy (ORCPT ); Tue, 9 Dec 2008 15:14:54 -0500 Received: from moutng.kundenserver.de ([212.227.126.188]:61039 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754154AbYLIUOu (ORCPT ); Tue, 9 Dec 2008 15:14:50 -0500 Received: from kruemel.eitzenberger.org (p54AD353E.dip0.t-ipconnect.de [84.173.53.62]) by mrelayeu.kundenserver.de (node=mrelayeu8) with ESMTP (Nemesis) id 0ML31I-1LA8ym1snB-0000se; Tue, 09 Dec 2008 21:14:48 +0100 Received: from [192.168.11.10] (helo=jonathan.eitzenberger.org ident=holger) by kruemel.eitzenberger.org with smtp (Exim 4.50) id 1LA8yk-0001Xy-MG; Tue, 09 Dec 2008 21:14:47 +0100 Received: by jonathan.eitzenberger.org (sSMTP sendmail emulation); Tue, 09 Dec 2008 21:14:46 +0100 Message-Id: <20081209201446.222212807@eitzenberger.org> References: <20081209200750.490739902@eitzenberger.org> User-Agent: quilt/0.46-1 Date: Tue, 09 Dec 2008 21:07:52 +0100 From: holger@eitzenberger.org To: Jay Vosburgh Cc: netdev@vger.kernel.org Subject: [patch 2/7] bonding: use table for mode names Content-Disposition: inline; filename=bonding-use-table-for-3ad-mode-names.diff X-Provags-ID: V01U2FsdGVkX18TAX5RbQPegm7+nOL6sAWfXV+w0z8n0uu1p6L dL85xe+MU+LhsAidDgtCR+XYA1/b4fkSgviTzTyNKEXbr1eowe hICtn+uTGwgntlVTsoBJp/FzMrT8HoTYRDW/4TfKZw= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use a small array in bond_mode_name() for the names, thus saving some space: before text data bss dec hex filename 57736 9372 344 67452 1077c drivers/net/bonding/bonding.ko after text data bss dec hex filename 57441 9372 344 67157 10655 drivers/net/bonding/bonding.ko Signed-off-by: Holger Eitzenberger Index: bonding-2.6/drivers/net/bonding/bond_main.c =================================================================== --- bonding-2.6.orig/drivers/net/bonding/bond_main.c 2008-12-08 20:55:52.000000000 +0100 +++ bonding-2.6/drivers/net/bonding/bond_main.c 2008-12-08 22:16:02.000000000 +0100 @@ -219,24 +219,20 @@ 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 -----------------------------------*/