-stable review patch. If anyone has any objections, please let us know. ------------------ From: Stephen Hemminger The sky2 driver will hang if transmit flow control is enabled and it receives a pause frame. The pause frame gets partially processed by hardware but never makes it through to the correct logic. This patch made it into 2.6.17 stable, but never got accepted for 2.6.18, so it will have to go into 2.6.18.1 See also: http://bugzilla.kernel.org/show_bug.cgi?id=6839 Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman --- drivers/net/sky2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.18.orig/drivers/net/sky2.h +++ linux-2.6.18/drivers/net/sky2.h @@ -1566,7 +1566,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_GOOD_FC | + GMR_FS_MII_ERR | GMR_FS_BAD_FC | GMR_FS_UN_SIZE | GMR_FS_JABBER, }; --