diff mbox

[3/5] UBUNTU: [Upstream] net: Fix Yukon-2 Optima TCP offload setup

Message ID i2zf17812d71004112333qc29a6ad0r3839c461cc64234e@mail.gmail.com
State Accepted
Delegated to: Andy Whitcroft
Headers show

Commit Message

Eric Miao April 12, 2010, 6:33 a.m. UTC 
From 14c52bbf5126736e2e83d22c984e56b80572e5f5 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
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 <tiwai@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit b338682dc5c20e8ff986e58407bdb6e3a3e3f0a3)

Signed-off-by: Eric Miao <eric.miao@canonical.com>
---
 drivers/net/sky2.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
diff mbox

Patch

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;