* [PATCH net-next] e1000e: restore call to pci_clear_master()
@ 2013-06-12 17:47 Dean Nelson
2013-06-12 18:38 ` Sergei Shtylyov
0 siblings, 1 reply; 6+ messages in thread
From: Dean Nelson @ 2013-06-12 17:47 UTC (permalink / raw)
To: David Miller; +Cc: Konstantin Khlebnikov, netdev, Jeff Kirsher, Bruce Allan
In attempting to resolve a minor merge conflict, commit e5f2ef7ab4690d2e8faa
accidently dropped a call to pci_clear_master() that was intended to remain
in place.
Commit 4e0855dff094b0d56d6b replaced a call to pci_disable_device() by one to
pci_clear_master(). And then commit 66148babe728f3e00e13 deleted a number of
lines starting two lines following that call.
This patch restores the call to pci_clear_master() in __e1000_shutdown().
Signed-off-by: Dean Nelson <dnelson@redhat.com>
---
Both stable 3.8.y and 3.9.y appear to have the call to pci_clear_master() in
__e1000_shutdown() as desired. I'm not sure how they avoided the conflict.
drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 77f81cb..5475cf4 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5995,6 +5995,8 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
*/
e1000e_release_hw_control(adapter);
+ pci_clear_master(pdev);
+
/* The pci-e switch on some quad port adapters will report a
* correctable error when the MAC transitions from D0 to D3. To
* prevent this we need to mask off the correctable errors on the
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] e1000e: restore call to pci_clear_master()
2013-06-12 17:47 [PATCH net-next] e1000e: restore call to pci_clear_master() Dean Nelson
@ 2013-06-12 18:38 ` Sergei Shtylyov
2013-06-12 18:53 ` Dean Nelson
0 siblings, 1 reply; 6+ messages in thread
From: Sergei Shtylyov @ 2013-06-12 18:38 UTC (permalink / raw)
To: Dean Nelson
Cc: David Miller, Konstantin Khlebnikov, netdev, Jeff Kirsher,
Bruce Allan
Hello.
On 06/12/2013 09:47 PM, Dean Nelson wrote:
> In attempting to resolve a minor merge conflict, commit e5f2ef7ab4690d2e8faa
> accidently dropped a call to pci_clear_master() that was intended to remain
> in place.
> Commit 4e0855dff094b0d56d6b replaced a call to pci_disable_device() by one to
Please specify the summary line in parens for both commmits you're
mentioning.
> pci_clear_master(). And then commit 66148babe728f3e00e13 deleted a number of
> lines starting two lines following that call.
> This patch restores the call to pci_clear_master() in __e1000_shutdown().
> Signed-off-by: Dean Nelson <dnelson@redhat.com>
WBR, Sergei
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH net-next] e1000e: restore call to pci_clear_master()
2013-06-12 18:38 ` Sergei Shtylyov
@ 2013-06-12 18:53 ` Dean Nelson
2013-06-12 19:05 ` Sergei Shtylyov
2013-06-12 19:41 ` Jeff Kirsher
0 siblings, 2 replies; 6+ messages in thread
From: Dean Nelson @ 2013-06-12 18:53 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: David Miller, Konstantin Khlebnikov, netdev, Jeff Kirsher,
Bruce Allan
On 06/12/2013 01:38 PM, Sergei Shtylyov wrote:
> Hello.
>
> On 06/12/2013 09:47 PM, Dean Nelson wrote:
>
>> In attempting to resolve a minor merge conflict, commit
>> e5f2ef7ab4690d2e8faa
>> accidently dropped a call to pci_clear_master() that was intended to
>> remain
>> in place.
>
>> Commit 4e0855dff094b0d56d6b replaced a call to pci_disable_device() by
>> one to
>
> Please specify the summary line in parens for both commmits you're
> mentioning.
Sorry, I'm not understanding fully. Are you asking me to repost the
patch with the changelog modified, such that each of the commits
mentioned has their summary statement following, enclosed in parens?
>> pci_clear_master(). And then commit 66148babe728f3e00e13 deleted a
>> number of
>> lines starting two lines following that call.
>
>> This patch restores the call to pci_clear_master() in __e1000_shutdown().
>
>> Signed-off-by: Dean Nelson <dnelson@redhat.com>
>
> WBR, Sergei
>
>
Also, I mistyped Jeff Kirsher's email address. It's corrected above.
(Sorry, Jeff.)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] e1000e: restore call to pci_clear_master()
2013-06-12 18:53 ` Dean Nelson
@ 2013-06-12 19:05 ` Sergei Shtylyov
2013-06-12 19:41 ` Jeff Kirsher
1 sibling, 0 replies; 6+ messages in thread
From: Sergei Shtylyov @ 2013-06-12 19:05 UTC (permalink / raw)
To: Dean Nelson
Cc: David Miller, Konstantin Khlebnikov, netdev, Jeff Kirsher,
Bruce Allan
On 06/12/2013 10:53 PM, Dean Nelson wrote:
>>> In attempting to resolve a minor merge conflict, commit
>>> e5f2ef7ab4690d2e8faa
>>> accidently dropped a call to pci_clear_master() that was intended to
>>> remain
>>> in place.
>>> Commit 4e0855dff094b0d56d6b replaced a call to pci_disable_device() by
>>> one to
>> Please specify the summary line in parens for both commmits you're
>> mentioning.
> Sorry, I'm not understanding fully. Are you asking me to repost the
> patch with the changelog modified, such that each of the commits
> mentioned has their summary statement following, enclosed in parens?
Exactly.
>>> pci_clear_master(). And then commit 66148babe728f3e00e13 deleted a
>>> number of
>>> lines starting two lines following that call.
>>> This patch restores the call to pci_clear_master() in
>>> __e1000_shutdown().
>>> Signed-off-by: Dean Nelson <dnelson@redhat.com>
[...]
> Also, I mistyped Jeff Kirsher's email address. It's corrected above.
> (Sorry, Jeff.)
When reposting, you'll have a chance to fix up his email as well. :-)
WBR, Sergei
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH net-next] e1000e: restore call to pci_clear_master()
2013-06-12 18:53 ` Dean Nelson
2013-06-12 19:05 ` Sergei Shtylyov
@ 2013-06-12 19:41 ` Jeff Kirsher
2013-06-12 19:45 ` Dean Nelson
1 sibling, 1 reply; 6+ messages in thread
From: Jeff Kirsher @ 2013-06-12 19:41 UTC (permalink / raw)
To: Dean Nelson
Cc: Sergei Shtylyov, David Miller, Konstantin Khlebnikov, netdev,
Bruce Allan
[-- Attachment #1: Type: text/plain, Size: 1332 bytes --]
On Wed, 2013-06-12 at 13:53 -0500, Dean Nelson wrote:
> On 06/12/2013 01:38 PM, Sergei Shtylyov wrote:
> > Hello.
> >
> > On 06/12/2013 09:47 PM, Dean Nelson wrote:
> >
> >> In attempting to resolve a minor merge conflict, commit
> >> e5f2ef7ab4690d2e8faa
> >> accidently dropped a call to pci_clear_master() that was intended to
> >> remain
> >> in place.
> >
> >> Commit 4e0855dff094b0d56d6b replaced a call to pci_disable_device() by
> >> one to
> >
> > Please specify the summary line in parens for both commmits you're
> > mentioning.
>
> Sorry, I'm not understanding fully. Are you asking me to repost the
> patch with the changelog modified, such that each of the commits
> mentioned has their summary statement following, enclosed in parens?
>
>
> >> pci_clear_master(). And then commit 66148babe728f3e00e13 deleted a
> >> number of
> >> lines starting two lines following that call.
> >
> >> This patch restores the call to pci_clear_master() in __e1000_shutdown().
> >
> >> Signed-off-by: Dean Nelson <dnelson@redhat.com>
> >
> > WBR, Sergei
> >
> >
>
> Also, I mistyped Jeff Kirsher's email address. It's corrected above.
> (Sorry, Jeff.)
No problem, will you be sending a v2 based on Sergei's feedback? Just
need to know if I add this patch to my queue or wait for v2.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] e1000e: restore call to pci_clear_master()
2013-06-12 19:41 ` Jeff Kirsher
@ 2013-06-12 19:45 ` Dean Nelson
0 siblings, 0 replies; 6+ messages in thread
From: Dean Nelson @ 2013-06-12 19:45 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: Sergei Shtylyov, David Miller, Konstantin Khlebnikov, netdev,
Bruce Allan
On 06/12/2013 02:41 PM, Jeff Kirsher wrote:
> On Wed, 2013-06-12 at 13:53 -0500, Dean Nelson wrote:
>> On 06/12/2013 01:38 PM, Sergei Shtylyov wrote:
>>> Hello.
>>>
>>> On 06/12/2013 09:47 PM, Dean Nelson wrote:
>>>
>>>> In attempting to resolve a minor merge conflict, commit
>>>> e5f2ef7ab4690d2e8faa
>>>> accidently dropped a call to pci_clear_master() that was intended to
>>>> remain
>>>> in place.
>>>
>>>> Commit 4e0855dff094b0d56d6b replaced a call to pci_disable_device() by
>>>> one to
>>>
>>> Please specify the summary line in parens for both commmits you're
>>> mentioning.
>>
>> Sorry, I'm not understanding fully. Are you asking me to repost the
>> patch with the changelog modified, such that each of the commits
>> mentioned has their summary statement following, enclosed in parens?
>>
>>
>>>> pci_clear_master(). And then commit 66148babe728f3e00e13 deleted a
>>>> number of
>>>> lines starting two lines following that call.
>>>
>>>> This patch restores the call to pci_clear_master() in __e1000_shutdown().
>>>
>>>> Signed-off-by: Dean Nelson <dnelson@redhat.com>
>>>
>>> WBR, Sergei
>>>
>>>
>>
>> Also, I mistyped Jeff Kirsher's email address. It's corrected above.
>> (Sorry, Jeff.)
>
> No problem, will you be sending a v2 based on Sergei's feedback? Just
> need to know if I add this patch to my queue or wait for v2.
Yes, I just sent it.
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-06-12 19:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-12 17:47 [PATCH net-next] e1000e: restore call to pci_clear_master() Dean Nelson
2013-06-12 18:38 ` Sergei Shtylyov
2013-06-12 18:53 ` Dean Nelson
2013-06-12 19:05 ` Sergei Shtylyov
2013-06-12 19:41 ` Jeff Kirsher
2013-06-12 19:45 ` Dean Nelson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).