From patchwork Mon Apr 12 06:34:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Miao X-Patchwork-Id: 49945 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id E3890B7D11 for ; Mon, 12 Apr 2010 16:35:18 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O1DEn-00084p-LZ; Mon, 12 Apr 2010 07:35:13 +0100 Received: from mail-qy0-f173.google.com ([209.85.221.173]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O1DEl-0007Pt-RZ for kernel-team@lists.ubuntu.com; Mon, 12 Apr 2010 07:35:11 +0100 Received: by mail-qy0-f173.google.com with SMTP id 4so5341165qyk.17 for ; Sun, 11 Apr 2010 23:35:11 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.88.148 with HTTP; Sun, 11 Apr 2010 23:34:51 -0700 (PDT) From: Eric Miao Date: Mon, 12 Apr 2010 14:34:51 +0800 X-Google-Sender-Auth: db62519e6545912d Received: by 10.229.225.72 with SMTP id ir8mr5447967qcb.73.1271054111318; Sun, 11 Apr 2010 23:35:11 -0700 (PDT) Message-ID: Subject: [PATCH 5/5] UBUNTU: [Upstream] sky2: print Optima chip name To: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From f4d3d2bbc553f909936667337d1c8000868f1d4c Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Mon, 14 Dec 2009 08:33:47 +0000 Subject: [PATCH 5/5] UBUNTU: [Upstream] sky2: print Optima chip name BugLink: http://bugs.launchpad.net/bugs/537168 Off by one in name lookup makes Optima display as (chip 0xbc) Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller (cherry picked from commit dae3a5112d258764cad9e48439ca7dd05c2edca1) Signed-off-by: Eric Miao --- drivers/net/sky2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 0678cc0..e5af1c9 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -4493,7 +4493,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz) "Optima", /* 0xbc */ }; - if (chipid >= CHIP_ID_YUKON_XL && chipid < CHIP_ID_YUKON_OPT) + if (chipid >= CHIP_ID_YUKON_XL && chipid <= CHIP_ID_YUKON_OPT) strncpy(buf, name[chipid - CHIP_ID_YUKON_XL], sz); else snprintf(buf, sz, "(chip %#x)", chipid);