Message ID | EA929A9653AAE14F841771FB1DE5A1365F71995716@rrsmsx501.amr.corp.intel.com |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On Tue, Mar 31, 2009 at 12:14 PM, Tantilov, Emil S <emil.s.tantilov@intel.com> wrote: > > The patch checks out. I tested suspend/resume (including WOL) and kexec. There is only a small issue with warning on compile when CONFIG_PM is disabled: > > diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c > index 13fe162..0a4f8f4 100644 > --- a/drivers/net/igb/igb_main.c > +++ b/drivers/net/igb/igb_main.c > @@ -135,8 +135,8 @@ static inline int igb_set_vf_rlpml(struct igb_adapter *, int, int); > static int igb_set_vf_mac(struct igb_adapter *adapter, int, unsigned char *); > static void igb_restore_vf_multicasts(struct igb_adapter *adapter); > > -static int igb_suspend(struct pci_dev *, pm_message_t); > #ifdef CONFIG_PM > +static int igb_suspend(struct pci_dev *, pm_message_t); > static int igb_resume(struct pci_dev *); > #endif > static void igb_shutdown(struct pci_dev *); > > Thanks, > Emil > Rafael - Based on Emil's testing, I will modify the patch with Emil's suggestion and push to Dave, ok?
On Tuesday 31 March 2009, Jeff Kirsher wrote: > On Tue, Mar 31, 2009 at 12:14 PM, Tantilov, Emil S > <emil.s.tantilov@intel.com> wrote: > > > > The patch checks out. I tested suspend/resume (including WOL) and kexec. There is only a small issue with warning on compile when CONFIG_PM is disabled: > > > > diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c > > index 13fe162..0a4f8f4 100644 > > --- a/drivers/net/igb/igb_main.c > > +++ b/drivers/net/igb/igb_main.c > > @@ -135,8 +135,8 @@ static inline int igb_set_vf_rlpml(struct igb_adapter *, int, int); > > static int igb_set_vf_mac(struct igb_adapter *adapter, int, unsigned char *); > > static void igb_restore_vf_multicasts(struct igb_adapter *adapter); > > > > -static int igb_suspend(struct pci_dev *, pm_message_t); > > #ifdef CONFIG_PM > > +static int igb_suspend(struct pci_dev *, pm_message_t); > > static int igb_resume(struct pci_dev *); > > #endif > > static void igb_shutdown(struct pci_dev *); > > > > Thanks, > > Emil > > > > Rafael - Based on Emil's testing, I will modify the patch with Emil's > suggestion and push to Dave, ok? Fine with me. Thanks, Rafael -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 13fe162..0a4f8f4 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -135,8 +135,8 @@ static inline int igb_set_vf_rlpml(struct igb_adapter *, int, int); static int igb_set_vf_mac(struct igb_adapter *adapter, int, unsigned char *); static void igb_restore_vf_multicasts(struct igb_adapter *adapter); -static int igb_suspend(struct pci_dev *, pm_message_t); #ifdef CONFIG_PM +static int igb_suspend(struct pci_dev *, pm_message_t); static int igb_resume(struct pci_dev *); #endif static void igb_shutdown(struct pci_dev *);