From patchwork Mon Apr 12 06:33:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Miao X-Patchwork-Id: 49943 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 7DDC1B7D19 for ; Mon, 12 Apr 2010 16:34:27 +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 1O1DDx-0007k7-HN; Mon, 12 Apr 2010 07:34:21 +0100 Received: from mail-qy0-f173.google.com ([209.85.221.173]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O1DDs-0007Pt-0m for kernel-team@lists.ubuntu.com; Mon, 12 Apr 2010 07:34:16 +0100 Received: by mail-qy0-f173.google.com with SMTP id 4so5341165qyk.17 for ; Sun, 11 Apr 2010 23:34:15 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.88.148 with HTTP; Sun, 11 Apr 2010 23:33:55 -0700 (PDT) From: Eric Miao Date: Mon, 12 Apr 2010 14:33:55 +0800 X-Google-Sender-Auth: 5613112136f72968 Received: by 10.229.216.76 with SMTP id hh12mr5391020qcb.47.1271054055423; Sun, 11 Apr 2010 23:34:15 -0700 (PDT) Message-ID: Subject: [PATCH 3/5] UBUNTU: [Upstream] net: Fix Yukon-2 Optima TCP offload setup 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 14c52bbf5126736e2e83d22c984e56b80572e5f5 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 3 Dec 2009 05:12:01 +0000 Subject: [PATCH 3/5] UBUNTU: [Upstream] net: Fix Yukon-2 Optima TCP offload setup BugLink: http://bugs.launchpad.net/bugs/537168 Fix the TCP offload setup for Yukon-2 Optima. It requires SKY2_HW_NE_LE flag unlike Ultra 2. Signed-off-by: Takashi Iwai Signed-off-by: David S. Miller (cherry picked from commit b338682dc5c20e8ff986e58407bdb6e3a3e3f0a3) Signed-off-by: Eric Miao --- drivers/net/sky2.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 1d1bee1..11aebc5 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -2937,8 +2937,13 @@ static int __devinit sky2_init(struct sky2_hw *hw) break; case CHIP_ID_YUKON_UL_2: + hw->flags = SKY2_HW_GIGABIT + | SKY2_HW_ADV_POWER_CTL; + break; + case CHIP_ID_YUKON_OPT: hw->flags = SKY2_HW_GIGABIT + | SKY2_HW_NEW_LE | SKY2_HW_ADV_POWER_CTL; break;