Message ID | 1419319024-30455-1-git-send-email-baijiaju1990@163.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
Hello. On 12/23/2014 10:17 AM, Jia-Ju Bai wrote: > For linux-3.18.0 For the future: such words should be placed under --- tear line... > The driver lacks igb_disable_sriov in error handling, > which should match igb_enable_sriov in igb_probe. > This patch fixes this problem, and it has been tested in runtime. > Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com> > --- .... here. > drivers/net/ethernet/intel/igb/igb_main.c | 4 ++++ > 1 file changed, 4 insertions(+) WBR, Sergei -- 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
On 12/23/2014 07:23 PM, Sergei Shtylyov wrote: > Hello. > > On 12/23/2014 10:17 AM, Jia-Ju Bai wrote: > >> For linux-3.18.0 > > For the future: such words should be placed under --- tear line... > >> The driver lacks igb_disable_sriov in error handling, >> which should match igb_enable_sriov in igb_probe. >> This patch fixes this problem, and it has been tested in runtime. > >> Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com> >> --- > > .... here. > >> drivers/net/ethernet/intel/igb/igb_main.c | 4 ++++ >> 1 file changed, 4 insertions(+) > > WBR, Sergei > Thanks. ^_^ I see that most patches in netdev mailing list do not mention the linux kernel version, so is it necessary to write the version in the patch? -- 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
On Tue, 2014-12-23 at 21:22 +0800, Jia-Ju Bai wrote: > On 12/23/2014 07:23 PM, Sergei Shtylyov wrote: > > Hello. > > > > On 12/23/2014 10:17 AM, Jia-Ju Bai wrote: > > > >> For linux-3.18.0 > > > > For the future: such words should be placed under --- tear line... > > > >> The driver lacks igb_disable_sriov in error handling, > >> which should match igb_enable_sriov in igb_probe. > >> This patch fixes this problem, and it has been tested in runtime. > > > >> Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com> > >> --- > > > > .... here. > > > >> drivers/net/ethernet/intel/igb/igb_main.c | 4 ++++ > >> 1 file changed, 4 insertions(+) > > > > WBR, Sergei > > > > Thanks. ^_^ > I see that most patches in netdev mailing list do not mention the linux > kernel version, so is it necessary to write the version in the patch? > No it is not. If you were sending a patch (which has already been accepted upstream) to the stable trees, then you would specify what stable kernels the patch applies to. In your case, I would not consider your patches critical for the stable trees. So when sending patches, you inform the maintainer (i.e. me) what tree you want your patch applied by stating either "net" or "net-next" in the title. For example, this patch would be titled: [net v3 1/3] igb: Add igb_disable_sriov in error handling Which lets me know you want your patch applied to the "net" tree. If it were not a fix, then it would go into the "net-next" tree by using the title: [net-next v3 1/3] igb: Add igb_disable_sriov in error handling
On 12/23/2014 10:03 PM, Jeff Kirsher wrote: > > No it is not. If you were sending a patch (which has already been > accepted upstream) to the stable trees, then you would specify what > stable kernels the patch applies to. In your case, I would not consider > your patches critical for the stable trees. > > So when sending patches, you inform the maintainer (i.e. me) what tree > you want your patch applied by stating either "net" or "net-next" in the > title. For example, this patch would be titled: > > [net v3 1/3] igb: Add igb_disable_sriov in error handling > > Which lets me know you want your patch applied to the "net" tree. If it > were not a fix, then it would go into the "net-next" tree by using the > title: > > [net-next v3 1/3] igb: Add igb_disable_sriov in error handling > > Thanks! -- 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/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 487cd9c..91914e4 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -179,6 +179,7 @@ static void igb_check_vf_rate_limit(struct igb_adapter *); #ifdef CONFIG_PCI_IOV static int igb_vf_configure(struct igb_adapter *adapter, int vf); static int igb_pci_enable_sriov(struct pci_dev *dev, int num_vfs); +static int igb_disable_sriov(struct pci_dev *pdev); #endif #ifdef CONFIG_PM @@ -2653,6 +2654,9 @@ err_register: igb_release_hw_control(adapter); memset(&adapter->i2c_adap, 0, sizeof(adapter->i2c_adap)); err_eeprom: +#ifdef CONFIG_PCI_IOV + igb_disable_sriov(pdev); +#endif if (!igb_check_reset_block(hw)) igb_reset_phy(hw);
For linux-3.18.0 The driver lacks igb_disable_sriov in error handling, which should match igb_enable_sriov in igb_probe. This patch fixes this problem, and it has been tested in runtime. Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com> --- drivers/net/ethernet/intel/igb/igb_main.c | 4 ++++ 1 file changed, 4 insertions(+)