lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e1000: FIX: don't poke at manageability registers for incompatible adapters

Browse Source 
The MANC register should not be read for PCI-E adapters at all, as well as
82543 and older where 82543 would master abort when this register was
accessed.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
This commit is contained in:
Jesse Brandeburg
2006-10-24 14:45:53 -07:00
committed by Auke Kok
parent 5826cade43
commit 4ccc12aeec
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/e1000/e1000_ethtool.c
View File

@ -461,7 +461,8 @@ e1000_get_regs(struct net_device *netdev,
regs_buff[24] = (uint32_t)phy_data; /* phy local receiver status */
regs_buff[25] = regs_buff[24]; /* phy remote receiver status */
if (hw->mac_type >= e1000_82540 &&
hw->media_type == e1000_media_type_copper) {
hw->mac_type < e1000_82571 &&
hw->media_type == e1000_media_type_copper) {
regs_buff[26] = E1000_READ_REG(hw, MANC);
}
}