e1000e: fix check for manageability on ICHx/PCH
authorBruce Allan <bruce.w.allan@intel.com>
Wed, 16 Jun 2010 13:27:05 +0000 (13:27 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 19 Jun 2010 05:12:16 +0000 (22:12 -0700)
commiteb7700dc0344564b0b9857d1f5e331a0dd629e92
tree0d8df01136477c3546bdfd15db1507e3d3cdb37d
parent8c7bbb925337705dd1459070ac620aeec6a29666
e1000e: fix check for manageability on ICHx/PCH

Do not check for all the bits in E1000_FWSM_MODE_MASK when checking for
manageability on 82577/82578; only check if iAMT is enabled.  Both of the
manageability checks (for 82577/82578 and ICHx) must check the firmware
valid bit too since the other bits are only valid when the latter is set.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/e1000e/ich8lan.c