UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
David S. Miller 2017-06-08 14:41:19 -04:00
parent b3fd82207e 833521ebc6
commit 3948b57bd5
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/intel/e1000e/netdev.c
View File

@ -6640,12 +6640,17 @@ static int e1000e_pm_thaw(struct device *dev)
static int e1000e_pm_suspend(struct device *dev) static int e1000e_pm_suspend(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
int rc;
e1000e_flush_lpic(pdev); e1000e_flush_lpic(pdev);
e1000e_pm_freeze(dev); 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) static int e1000e_pm_resume(struct device *dev)

6
drivers/net/ethernet/intel/igb/igb_main.c
View File

@ -6469,7 +6469,7 @@ static void igb_set_default_mac_filter(struct igb_adapter *adapter)
igb_rar_set_index(adapter, 0); igb_rar_set_index(adapter, 0);
} }
int igb_add_mac_filter(struct igb_adapter *adapter, const u8 *addr, static int igb_add_mac_filter(struct igb_adapter *adapter, const u8 *addr,
const u8 queue) const u8 queue)
{ {
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
@ -6499,7 +6499,7 @@ int igb_add_mac_filter(struct igb_adapter *adapter, const u8 *addr,
return -ENOSPC; return -ENOSPC;
} }
int igb_del_mac_filter(struct igb_adapter *adapter, const u8 *addr, static int igb_del_mac_filter(struct igb_adapter *adapter, const u8 *addr,
const u8 queue) const u8 queue)
{ {
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
@ -6552,7 +6552,7 @@ static int igb_uc_unsync(struct net_device *netdev, const unsigned char *addr)
return 0; return 0;
} }
int igb_set_vf_mac_filter(struct igb_adapter *adapter, const int vf, static int igb_set_vf_mac_filter(struct igb_adapter *adapter, const int vf,
const u32 info, const u8 *addr) const u32 info, const u8 *addr)
{ {
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;