From a50b3420f5cb5962cb60a1f53875e3eb56e4a4ec Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Fri, 15 Dec 2006 10:38:32 +0100 Subject: [PATCH] --- yaml --- r: 45032 b: refs/heads/master c: d89b6c6750e7d7527603b573ec60ba787f5c04a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a932e75e6e99..ae92e22686d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3813ae6615107cc93c79200f477ffd2a870c8ab +refs/heads/master: d89b6c6750e7d7527603b573ec60ba787f5c04a6 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 0d7c458168d3..e04f1ba847fd 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -1582,9 +1582,9 @@ e1000_configure_tx(struct e1000_adapter *adapter) } /* Set the default values for the Tx Inter Packet Gap timer */ - - if (hw->media_type == e1000_media_type_fiber || - hw->media_type == e1000_media_type_internal_serdes) + if (adapter->hw.mac_type <= e1000_82547_rev_2 && + (hw->media_type == e1000_media_type_fiber || + hw->media_type == e1000_media_type_internal_serdes)) tipg = DEFAULT_82543_TIPG_IPGT_FIBER; else tipg = DEFAULT_82543_TIPG_IPGT_COPPER;