aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/netdev.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2013-02-19 23:06:43 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-03-08 04:53:29 -0500
commit3ffcf2cb1e1b68eb48011158a023ee1d0bb4b1fc (patch)
tree3ba564ba06eca932cc36e8aec572b80969eacf01 /drivers/net/ethernet/intel/e1000e/netdev.c
parentbbf441271b3c0e631f3687fef398c8a47fe0e3cd (diff)
e1000e: cleanup - move defines to appropriate header file
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index b085ce1d4546..b4eab18e1c16 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -1957,7 +1957,6 @@ static void e1000_configure_msix(struct e1000_adapter *adapter)
1957 ew32(RFCTL, rfctl); 1957 ew32(RFCTL, rfctl);
1958 } 1958 }
1959 1959
1960#define E1000_IVAR_INT_ALLOC_VALID 0x8
1961 /* Configure Rx vector */ 1960 /* Configure Rx vector */
1962 rx_ring->ims_val = E1000_IMS_RXQ0; 1961 rx_ring->ims_val = E1000_IMS_RXQ0;
1963 adapter->eiac_mask |= rx_ring->ims_val; 1962 adapter->eiac_mask |= rx_ring->ims_val;
@@ -5911,10 +5910,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
5911 } 5910 }
5912 5911
5913 ctrl = er32(CTRL); 5912 ctrl = er32(CTRL);
5914 /* advertise wake from D3Cold */
5915 #define E1000_CTRL_ADVD3WUC 0x00100000
5916 /* phy power management enable */
5917 #define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000
5918 ctrl |= E1000_CTRL_ADVD3WUC; 5913 ctrl |= E1000_CTRL_ADVD3WUC;
5919 if (!(adapter->flags2 & FLAG2_HAS_PHY_WAKEUP)) 5914 if (!(adapter->flags2 & FLAG2_HAS_PHY_WAKEUP))
5920 ctrl |= E1000_CTRL_EN_PHY_PWR_MGMT; 5915 ctrl |= E1000_CTRL_EN_PHY_PWR_MGMT;