34 lines
985 B
Diff
34 lines
985 B
Diff
|
From: Takashi Iwai <tiwai@suse.de>
|
||
|
|
Date: Thu, 3 Dec 2009 05:12:01 +0000 (+0000)
|
||
|
|
Subject: net: Fix Yukon-2 Optima TCP offload setup
|
||
|
|
X-Git-Tag: v2.6.33-rc1~59^2~39
|
||
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b338682dc5c20e8ff986e58407bdb6e3a3e3f0a3
|
||
|
|
|
||
|
|
net: Fix Yukon-2 Optima TCP offload setup
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
|
||
|
|
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
|
||
|
|
index 3943d89..050e6b5 100644
|
||
|
|
--- a/drivers/net/sky2.c
|
||
|
|
+++ b/drivers/net/sky2.c
|
||
|
|
@@ -2968,8 +2968,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;
|
||
|
|
|