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
| ||
|
Date: Mon, 23 Mar 2015 10:55:15 +0000 From: Shradha Shah <sshah@...arflare.com> To: Benjamin Herrenschmidt <benh@...nel.crashing.org>, David Miller <davem@...emloft.net> CC: <netdev@...r.kernel.org> Subject: Re: sfc fixup patch On 23/03/15 03:10, Benjamin Herrenschmidt wrote: > Hi Dave, Shradha ! > > While merging some EEH changes, I noticed a breakage in the SFC driver > due to it using an API we didn't mean driver to use directly and that > is going away. I've done this small fixup patch, any objection to me > sticking it in the original series (as to avoid bisection breaks) > before I send it to Linus ? > > Cheers, > Ben. > > net/ethernet/sfc: Don't use of_node_to_eeh_dev() > > This is deprecated, it forces the driver to hop via the OF node > that may or may not exist, instead use pci_dev_to_eeh_dev() which > is simpler. > > Signed-off-by: Benjamin Herrenschmidt <benh@...nel.crashing.org> Acked-by: Shradha Shah <sshah@...arflare.com> > --- > drivers/net/ethernet/sfc/efx.c | 4 +--- > drivers/net/ethernet/sfc/siena.c | 3 +-- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c > index 2384824..77d6453 100644 > --- a/drivers/net/ethernet/sfc/efx.c > +++ b/drivers/net/ethernet/sfc/efx.c > @@ -2523,9 +2523,7 @@ int efx_try_recovery(struct efx_nic *efx) > * schedule a 'recover or reset', leading to this recovery handler. > * Manually call the eeh failure check function. > */ > - struct eeh_dev *eehdev = > - of_node_to_eeh_dev(pci_device_to_OF_node(efx->pci_dev)); > - > + struct eeh_dev *eehdev = pci_dev_to_eeh_dev(efx->pci_dev); > if (eeh_dev_check_failure(eehdev)) { > /* The EEH mechanisms will handle the error and reset the > * device if necessary. > diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c > index 3583f02..f12c811 100644 > --- a/drivers/net/ethernet/sfc/siena.c > +++ b/drivers/net/ethernet/sfc/siena.c > @@ -205,8 +205,7 @@ static int siena_map_reset_flags(u32 *flags) > */ > static void siena_monitor(struct efx_nic *efx) > { > - struct eeh_dev *eehdev = > - of_node_to_eeh_dev(pci_device_to_OF_node(efx->pci_dev)); > + struct eeh_dev *eehdev = pci_dev_to_eeh_dev(efx->pci_dev); > > eeh_dev_check_failure(eehdev); > } > > -- Many Thanks, Regards, Shradha Shah -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists