Jesse Keating 2f82dd
From: Takashi Iwai <tiwai@suse.de>
Jesse Keating 2f82dd
Date: Thu, 3 Dec 2009 05:12:01 +0000 (+0000)
Jesse Keating 2f82dd
Subject: net: Fix Yukon-2 Optima TCP offload setup
Jesse Keating 2f82dd
X-Git-Tag: v2.6.33-rc1~59^2~39
Jesse Keating 2f82dd
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b338682dc5c20e8ff986e58407bdb6e3a3e3f0a3
Jesse Keating 2f82dd
Jesse Keating 2f82dd
net: Fix Yukon-2 Optima TCP offload setup
Jesse Keating 2f82dd
Jesse Keating 2f82dd
Fix the TCP offload setup for Yukon-2 Optima.
Jesse Keating 2f82dd
It requires SKY2_HW_NE_LE flag unlike Ultra 2.
Jesse Keating 2f82dd
Jesse Keating 2f82dd
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Jesse Keating 2f82dd
Signed-off-by: David S. Miller <davem@davemloft.net>
Jesse Keating 2f82dd
---
Jesse Keating 2f82dd
Jesse Keating 2f82dd
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
Jesse Keating 2f82dd
index 3943d89..050e6b5 100644
Jesse Keating 2f82dd
--- a/drivers/net/sky2.c
Jesse Keating 2f82dd
+++ b/drivers/net/sky2.c
Jesse Keating 2f82dd
@@ -2968,8 +2968,13 @@ static int __devinit sky2_init(struct sky2_hw *hw)
Jesse Keating 2f82dd
 		break;
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
 	case CHIP_ID_YUKON_UL_2:
Jesse Keating 2f82dd
+		hw->flags = SKY2_HW_GIGABIT
Jesse Keating 2f82dd
+			| SKY2_HW_ADV_POWER_CTL;
Jesse Keating 2f82dd
+		break;
Jesse Keating 2f82dd
+
Jesse Keating 2f82dd
 	case CHIP_ID_YUKON_OPT:
Jesse Keating 2f82dd
 		hw->flags = SKY2_HW_GIGABIT
Jesse Keating 2f82dd
+			| SKY2_HW_NEW_LE
Jesse Keating 2f82dd
 			| SKY2_HW_ADV_POWER_CTL;
Jesse Keating 2f82dd
 		break;
Jesse Keating 2f82dd