diff options
| author | Mark Rustad <mark.d.rustad@intel.com> | 2014-01-14 18:53:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-14 18:59:17 -0800 |
| commit | b12babd4d0a83d9bae214e4c056711a279acad26 (patch) | |
| tree | 5752fbfb772d12d3566228566f94aea65a6b1148 /drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | |
| parent | 2a1a091c1ff898b1de4dcac2236b85f88aa9d51f (diff) | |
| download | op-kernel-dev-b12babd4d0a83d9bae214e4c056711a279acad26.zip op-kernel-dev-b12babd4d0a83d9bae214e4c056711a279acad26.tar.gz | |
ixgbe: Check for adapter removal on register writes
Prevent writes to an adapter that has been detected as removed
by a previous failing read. This also fixes some include file
ordering confusion that this patch revealed.
Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c index 39217e5..132557c 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c @@ -29,7 +29,7 @@ #include <linux/delay.h> #include <linux/sched.h> -#include "ixgbe_common.h" +#include "ixgbe.h" #include "ixgbe_phy.h" static void ixgbe_i2c_start(struct ixgbe_hw *hw); |
