Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8c2bd3d authored by Jeff Kirsher's avatar Jeff Kirsher Committed by Jeff Garzik
Browse files

[PATCH] e1000: Fix LED functionality for 82573 



Fixed adapter identification issue.

Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJohn Ronciak <john.ronciak@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 6b7660cd

drivers/net/e1000/e1000_ethtool.c

+15 −7
Original line number Diff line number Diff line
@@ -1699,9 +1699,17 @@ e1000_phys_id(struct net_device *netdev, uint32_t data) 
		mod_timer(&adapter->blink_timer, jiffies);

		msleep_interruptible(data * 1000);

		del_timer_sync(&adapter->blink_timer);

	}

	else {

		E1000_WRITE_REG(&adapter->hw, LEDCTL, (E1000_LEDCTL_LED2_BLINK_RATE |

	} else if (adapter->hw.mac_type < e1000_82573) {

		E1000_WRITE_REG(&adapter->hw, LEDCTL,

			(E1000_LEDCTL_LED2_BLINK_RATE |

			 E1000_LEDCTL_LED0_BLINK | E1000_LEDCTL_LED2_BLINK |

			 (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED2_MODE_SHIFT) |

			 (E1000_LEDCTL_MODE_LINK_ACTIVITY << E1000_LEDCTL_LED0_MODE_SHIFT) |

			 (E1000_LEDCTL_MODE_LED_OFF << E1000_LEDCTL_LED1_MODE_SHIFT)));

		msleep_interruptible(data * 1000);

	} else {

		E1000_WRITE_REG(&adapter->hw, LEDCTL,

			(E1000_LEDCTL_LED2_BLINK_RATE |

			 E1000_LEDCTL_LED1_BLINK | E1000_LEDCTL_LED2_BLINK |

			 (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED2_MODE_SHIFT) |

			 (E1000_LEDCTL_MODE_LINK_ACTIVITY << E1000_LEDCTL_LED1_MODE_SHIFT) |