From 3d4c95ce58548e02bcaf9cbb79006ffa22ef71e4 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Wed, 22 Feb 2012 09:03:09 +0000 Subject: [PATCH] --- yaml --- r: 290479 b: refs/heads/master c: 0d37678e16fd4db3cf74fa840e7f98a0b7d40742 h: refs/heads/master i: 290477: 352a486b955743e32413b139cffccd6b80d43a7b 290475: 04731075d135ac0373a816856e40270a17d0b4ba 290471: 15e724531842ff54d1c08b284c2aae59db2a3b50 290463: 75135df8e94cc09f5bb2e14c8857e2f0f674ad3b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000e/mac.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 856db1cf04d8..16c10947c2b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b20caa80e8c9b0180defb42678209dc0d6c229d2 +refs/heads/master: 0d37678e16fd4db3cf74fa840e7f98a0b7d40742 diff --git a/trunk/drivers/net/ethernet/intel/e1000e/mac.c b/trunk/drivers/net/ethernet/intel/e1000e/mac.c index d55f5887b07a..59ac9f6353de 100644 --- a/trunk/drivers/net/ethernet/intel/e1000e/mac.c +++ b/trunk/drivers/net/ethernet/intel/e1000e/mac.c @@ -703,7 +703,6 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw) **/ s32 e1000e_setup_link_generic(struct e1000_hw *hw) { - struct e1000_mac_info *mac = &hw->mac; s32 ret_val; /* @@ -732,7 +731,7 @@ s32 e1000e_setup_link_generic(struct e1000_hw *hw) e_dbg("After fix-ups FlowControl is now = %x\n", hw->fc.current_mode); /* Call the necessary media_type subroutine to configure the link. */ - ret_val = mac->ops.setup_physical_interface(hw); + ret_val = hw->mac.ops.setup_physical_interface(hw); if (ret_val) return ret_val;