diff options
Diffstat (limited to 'drivers/net/atl1e/atl1e_main.c')
| -rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 35264c244cfd..7685b995ff9b 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
| @@ -47,7 +47,7 @@ MODULE_DESCRIPTION("Atheros 1000M Ethernet Network Driver"); | |||
| 47 | MODULE_LICENSE("GPL"); | 47 | MODULE_LICENSE("GPL"); |
| 48 | MODULE_VERSION(DRV_VERSION); | 48 | MODULE_VERSION(DRV_VERSION); |
| 49 | 49 | ||
| 50 | static inline void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter); | 50 | static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter); |
| 51 | 51 | ||
| 52 | static const u16 | 52 | static const u16 |
| 53 | atl1e_rx_page_vld_regs[AT_MAX_RECEIVE_QUEUE][AT_PAGE_NUM_PER_QUEUE] = | 53 | atl1e_rx_page_vld_regs[AT_MAX_RECEIVE_QUEUE][AT_PAGE_NUM_PER_QUEUE] = |
| @@ -1037,7 +1037,7 @@ static inline void atl1e_configure_dma(struct atl1e_adapter *adapter) | |||
| 1037 | return; | 1037 | return; |
| 1038 | } | 1038 | } |
| 1039 | 1039 | ||
| 1040 | static inline void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter) | 1040 | static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter) |
| 1041 | { | 1041 | { |
| 1042 | u32 value; | 1042 | u32 value; |
| 1043 | struct atl1e_hw *hw = &adapter->hw; | 1043 | struct atl1e_hw *hw = &adapter->hw; |
| @@ -2232,10 +2232,11 @@ static int atl1e_resume(struct pci_dev *pdev) | |||
| 2232 | 2232 | ||
| 2233 | AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); | 2233 | AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); |
| 2234 | 2234 | ||
| 2235 | if (netif_running(netdev)) | 2235 | if (netif_running(netdev)) { |
| 2236 | err = atl1e_request_irq(adapter); | 2236 | err = atl1e_request_irq(adapter); |
| 2237 | if (err) | 2237 | if (err) |
| 2238 | return err; | 2238 | return err; |
| 2239 | } | ||
| 2239 | 2240 | ||
| 2240 | atl1e_reset_hw(&adapter->hw); | 2241 | atl1e_reset_hw(&adapter->hw); |
| 2241 | 2242 | ||
