mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says: ==================== 1GbE Intel Wired LAN Driver Updates 2017-06-07 This series contains a fix for e1000e and igb. Colin Ian King fixes sparse warnings in igb by making functions static. Chris Wilson provides a fix for a previous commit which is causing an issue during suspend "e1000e_pm_suspend()", where we need to run e1000e_pm_thaw() if __e1000_shutdown() is unsuccessful. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
3948b57bd5
2 changed files with 12 additions and 7 deletions
|
@ -6640,12 +6640,17 @@ static int e1000e_pm_thaw(struct device *dev)
|
|||
static int e1000e_pm_suspend(struct device *dev)
|
||||
{
|
||||
struct pci_dev *pdev = to_pci_dev(dev);
|
||||
int rc;
|
||||
|
||||
e1000e_flush_lpic(pdev);
|
||||
|
||||
e1000e_pm_freeze(dev);
|
||||
|
||||
return __e1000_shutdown(pdev, false);
|
||||
rc = __e1000_shutdown(pdev, false);
|
||||
if (rc)
|
||||
e1000e_pm_thaw(dev);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int e1000e_pm_resume(struct device *dev)
|
||||
|
|
|
@ -6469,8 +6469,8 @@ static void igb_set_default_mac_filter(struct igb_adapter *adapter)
|
|||
igb_rar_set_index(adapter, 0);
|
||||
}
|
||||
|
||||
int igb_add_mac_filter(struct igb_adapter *adapter, const u8 *addr,
|
||||
const u8 queue)
|
||||
static int igb_add_mac_filter(struct igb_adapter *adapter, const u8 *addr,
|
||||
const u8 queue)
|
||||
{
|
||||
struct e1000_hw *hw = &adapter->hw;
|
||||
int rar_entries = hw->mac.rar_entry_count -
|
||||
|
@ -6499,8 +6499,8 @@ int igb_add_mac_filter(struct igb_adapter *adapter, const u8 *addr,
|
|||
return -ENOSPC;
|
||||
}
|
||||
|
||||
int igb_del_mac_filter(struct igb_adapter *adapter, const u8 *addr,
|
||||
const u8 queue)
|
||||
static int igb_del_mac_filter(struct igb_adapter *adapter, const u8 *addr,
|
||||
const u8 queue)
|
||||
{
|
||||
struct e1000_hw *hw = &adapter->hw;
|
||||
int rar_entries = hw->mac.rar_entry_count -
|
||||
|
@ -6552,8 +6552,8 @@ static int igb_uc_unsync(struct net_device *netdev, const unsigned char *addr)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int igb_set_vf_mac_filter(struct igb_adapter *adapter, const int vf,
|
||||
const u32 info, const u8 *addr)
|
||||
static int igb_set_vf_mac_filter(struct igb_adapter *adapter, const int vf,
|
||||
const u32 info, const u8 *addr)
|
||||
{
|
||||
struct pci_dev *pdev = adapter->pdev;
|
||||
struct vf_data_storage *vf_data = &adapter->vf_data[vf];
|
||||
|
|
Loading…
Reference in a new issue