diff for duplicates of <1480696918.16244.2.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 370b472..d1d5b2b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,8 +27,8 @@ On Fri, 2016-12-02 at 10:55 -0200, Guilherme G. Piccoli wrote: > > Reported-by: Harsha Thyagaraja <hathyaga@in.ibm.com> > > Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com> > > --- -> > ?drivers/net/ethernet/intel/igb/igb_main.c | 5 +++++ -> > ?1 file changed, 5 insertions(+) +> > drivers/net/ethernet/intel/igb/igb_main.c | 5 +++++ +> > 1 file changed, 5 insertions(+) > > > > diff --git a/drivers/net/ethernet/intel/igb/igb_main.c > > b/drivers/net/ethernet/intel/igb/igb_main.c @@ -37,18 +37,18 @@ On Fri, 2016-12-02 at 10:55 -0200, Guilherme G. Piccoli wrote: > > +++ b/drivers/net/ethernet/intel/igb/igb_main.c > > @@ -7878,6 +7878,11 @@ static pci_ers_result_t > > igb_io_slot_reset(struct pci_dev *pdev) -> > ? pci_enable_wake(pdev, PCI_D3hot, 0); -> > ? pci_enable_wake(pdev, PCI_D3cold, 0); +> > pci_enable_wake(pdev, PCI_D3hot, 0); +> > pci_enable_wake(pdev, PCI_D3cold, 0); > > > > + /* In case of PCI error, adapter lose its HW > > address -> > + ?* so we should re-assign it here. -> > + ?*/ +> > + * so we should re-assign it here. +> > + */ > > + hw->hw_addr = adapter->io_addr; > > + -> > ? igb_reset(adapter); -> > ? wr32(E1000_WUS, ~0); -> > ? result = PCI_ERS_RESULT_RECOVERED; +> > igb_reset(adapter); +> > wr32(E1000_WUS, ~0); +> > result = PCI_ERS_RESULT_RECOVERED; > > > > Ping? diff --git a/a/content_digest b/N1/content_digest index cbf51f6..f576304 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,16 @@ "ref\01478803603-30306-1-git-send-email-gpiccoli@linux.vnet.ibm.com\0" "ref\058416F5C.20602@linux.vnet.ibm.com\0" "From\0Keller, Jacob E <jacob.e.keller@intel.com>\0" - "Subject\0[Intel-wired-lan] [PATCH net v2] igb: re-assign hw address pointer on reset after PCI error\0" + "Subject\0Re: [PATCH net v2] igb: re-assign hw address pointer on reset after PCI error\0" "Date\0Fri, 2 Dec 2016 16:41:59 +0000\0" - "To\0intel-wired-lan@osuosl.org\0" + "To\0gpiccoli@linux.vnet.ibm.com <gpiccoli@linux.vnet.ibm.com>" + intel-wired-lan@lists.osuosl.org <intel-wired-lan@lists.osuosl.org> + Kirsher + Jeffrey T <jeffrey.t.kirsher@intel.com> + " alexander.duyck@gmail.com <alexander.duyck@gmail.com>\0" + "Cc\0netdev@vger.kernel.org <netdev@vger.kernel.org>" + Fujinaka + " Todd <todd.fujinaka@intel.com>\0" "\00:1\0" "b\0" "On Fri, 2016-12-02 at 10:55 -0200, Guilherme G. Piccoli wrote:\n" @@ -35,8 +42,8 @@ "> > Reported-by: Harsha Thyagaraja <hathyaga@in.ibm.com>\n" "> > Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>\n" "> > ---\n" - "> > ?drivers/net/ethernet/intel/igb/igb_main.c | 5 +++++\n" - "> > ?1 file changed, 5 insertions(+)\n" + "> > \302\240drivers/net/ethernet/intel/igb/igb_main.c | 5 +++++\n" + "> > \302\2401 file changed, 5 insertions(+)\n" "> > \n" "> > diff --git a/drivers/net/ethernet/intel/igb/igb_main.c\n" "> > b/drivers/net/ethernet/intel/igb/igb_main.c\n" @@ -45,18 +52,18 @@ "> > +++ b/drivers/net/ethernet/intel/igb/igb_main.c\n" "> > @@ -7878,6 +7878,11 @@ static pci_ers_result_t\n" "> > igb_io_slot_reset(struct pci_dev *pdev)\n" - "> > ?\t\tpci_enable_wake(pdev, PCI_D3hot, 0);\n" - "> > ?\t\tpci_enable_wake(pdev, PCI_D3cold, 0);\n" + "> > \302\240\t\tpci_enable_wake(pdev, PCI_D3hot, 0);\n" + "> > \302\240\t\tpci_enable_wake(pdev, PCI_D3cold, 0);\n" "> > \n" "> > +\t\t/* In case of PCI error, adapter lose its HW\n" "> > address\n" - "> > +\t\t?* so we should re-assign it here.\n" - "> > +\t\t?*/\n" + "> > +\t\t\302\240* so we should re-assign it here.\n" + "> > +\t\t\302\240*/\n" "> > +\t\thw->hw_addr = adapter->io_addr;\n" "> > +\n" - "> > ?\t\tigb_reset(adapter);\n" - "> > ?\t\twr32(E1000_WUS, ~0);\n" - "> > ?\t\tresult = PCI_ERS_RESULT_RECOVERED;\n" + "> > \302\240\t\tigb_reset(adapter);\n" + "> > \302\240\t\twr32(E1000_WUS, ~0);\n" + "> > \302\240\t\tresult = PCI_ERS_RESULT_RECOVERED;\n" "> > \n" "> \n" "> Ping?\n" @@ -76,4 +83,4 @@ "Thanks,\n" Jake -158c1b413d4311d513df3021bba2d0b29b2b2cc0e657be2ea3eb1bf6cdd96043 +e618ed954909c57d202f7c22a6fda40d3931a4bce3b806ae28e7d9ccbbc95b6c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.