From 89650b52562364f26fa84566f22f3f2d34d82397 Mon Sep 17 00:00:00 2001 From: "Kantecki, Tomasz" Date: Mon, 17 Oct 2011 22:06:59 +0000 Subject: [PATCH] --- yaml --- r: 273526 b: refs/heads/master c: d5a0e3640c05b7d07c548f9f8f986dbb87cfad98 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6d71b67010dd..42367ec75e33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 243559f436f26b571ea3a4e70ff082892dc58f16 +refs/heads/master: d5a0e3640c05b7d07c548f9f8f986dbb87cfad98 diff --git a/trunk/drivers/net/ethernet/intel/igb/e1000_phy.c b/trunk/drivers/net/ethernet/intel/igb/e1000_phy.c index 7edf31efe756..b17d7c20f817 100644 --- a/trunk/drivers/net/ethernet/intel/igb/e1000_phy.c +++ b/trunk/drivers/net/ethernet/intel/igb/e1000_phy.c @@ -1687,7 +1687,7 @@ s32 igb_get_cable_length_m88_gen2(struct e1000_hw *hw) if (ret_val) goto out; - is_cm = !(phy_data & I347AT4_PCDC_CABLE_LENGTH_UNIT); + is_cm = !(phy_data2 & I347AT4_PCDC_CABLE_LENGTH_UNIT); /* Populate the phy structure with cable length in meters */ phy->min_cable_length = phy_data / (is_cm ? 100 : 1);