aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshiharu Okada <toshiharu-linux@dsn.okisemi.com>2011-05-06 02:53:51 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-21 15:13:16 -0700
commitb9f596db8cefc8e4f0abd804edde9fde96ec0d01 (patch)
treeecf8a3f897d2a32006bb47e4585297ef288e3509
parent1b0b0acbe1d20b296ba9a9cc5a9d9b877e4c6eb5 (diff)
downloadlinux-2.6.38-lt-ux500-b9f596db8cefc8e4f0abd804edde9fde96ec0d01.tar.gz
PCH_GbE : Fixed the issue of collision detection
commit ce3dad0f74e6b240f0b1dedbd8ea268a3f298d82 upstream. The collision detection setting was invalid. When collision occurred, because data was not resent, there was an issue to which a transmitting throughput falls. This patch enables the collision detection. Signed-off-by: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/net/pch_gbe/pch_gbe_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c
index b99e90aca37..a2e7d63d7fd 100644
--- a/drivers/net/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/pch_gbe/pch_gbe_main.c
@@ -43,8 +43,7 @@ const char pch_driver_version[] = DRV_VERSION;
#define PCH_GBE_MAC_RGMII_CTRL_SETTING ( \
PCH_GBE_CHIP_TYPE_INTERNAL | \
- PCH_GBE_RGMII_MODE_RGMII | \
- PCH_GBE_CRS_SEL \
+ PCH_GBE_RGMII_MODE_RGMII \
)
/* Ethertype field values */