netdev - Re: [PATCH net-next v2] e1000e: restore call to pci_clear

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 12 Jun 2013 12:48:53 -0700
From:	Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To:	Dean Nelson <dnelson@...hat.com>
Cc:	David Miller <davem@...emloft.net>,
	Konstantin Khlebnikov <khlebnikov@...nvz.org>,
	netdev@...r.kernel.org, Bruce Allan <bruce.w.allan@...el.com>,
	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
Subject: Re: [PATCH net-next v2] e1000e: restore call to pci_clear_master()

On Wed, 2013-06-12 at 15:44 -0400, Dean Nelson wrote:
> In attempting to resolve a minor merge conflict, commit
> e5f2ef7ab4690d2e8faa
> (Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
> accidently
> dropped a call to pci_clear_master() that was intended to remain in
> place.
> 
> Commit 4e0855dff094b0d56d6b (e1000e: fix pci-device enable-counter
> balance)
> replaced a call to pci_disable_device() by one to pci_clear_master().
> And then
> commit 66148babe728f3e00e13 (e1000e: fix runtime power management
> transitions)
> deleted a number of lines starting two lines following that call.
> 
> This patch restores the call to pci_clear_master() in
> __e1000_shutdown().
> 
> v2: added summary lines (enclosed in parens) following commit IDs
> 
> Signed-off-by: Dean Nelson <dnelson@...hat.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(+) 

Thanks Dean, I will add this to my e1000e queue.

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)