---

yaml --- r: 290479 b: refs/heads/master c: 0d37678 h: refs/heads/master i: 290477: 352a486 290475: 0473107 290471: 15e7245 290463: 75135df v: v3
git-mirror · Feb 25, 2012 · 3d4c95c · 3d4c95c
1 parent 40ca7b7
commit 3d4c95c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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;