From: Stephen Hemminger <shemminger@osdl.org>
Date: Tue, 17 Oct 2006 17:24:25 +0000 (-0700)
Subject: sky2: GMAC pause frame
X-Git-Tag: Ubuntu-5.0.0-8.9~44820^2~47^2~107
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4e4bc305e16440ab38060d61fbcb7d774881d2f1;p=mirror_ubuntu-disco-kernel.git

sky2: GMAC pause frame

This reverts earlier change that attempted to fix flow control.
Device needs to discard pause frames, otherwise it hangs after a while.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
---

diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 3f05492da703..6d2a23f66c9a 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1576,7 +1576,7 @@ enum {
 
 	GMR_FS_ANY_ERR	= GMR_FS_RX_FF_OV | GMR_FS_CRC_ERR |
 			  GMR_FS_FRAGMENT | GMR_FS_LONG_ERR |
-		  	  GMR_FS_MII_ERR | GMR_FS_BAD_FC |
+		  	  GMR_FS_MII_ERR | GMR_FS_GOOD_FC | GMR_FS_BAD_FC |
 			  GMR_FS_UN_SIZE | GMR_FS_JABBER,
 };