[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAJZOPZLM+fRBqA_rkgiUO5FCd1YtzsCKN3=denHW6Tx7OHN6RQ@mail.gmail.com>
Date: Mon, 24 Mar 2014 08:40:42 +0200
From: Or Gerlitz <or.gerlitz@...il.com>
To: Wei Yang <weiyang@...ux.vnet.ibm.com>
Cc: Amir Vadai <amirv@...lanox.com>,
Jack Morgenstein <jackm@....mellanox.co.il>,
Or Gerlitz <ogerlitz@...lanox.com>,
David Miller <davem@...emloft.net>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: [PATCH] net/mlx4_core: pass pci_dev_data to __mlx4_init_one
On Mon, Mar 24, 2014 at 6:42 AM, Wei Yang <weiyang@...ux.vnet.ibm.com> wrote:
>
> The second parameter of __mlx4_init_one() is used to identify whether the
> pci_dev is a PF or VF. Currently, when it is invoked in mlx4_pci_slot_reset()
> this information is missed.
This patch isn't fixing something in 3.14, right? if this is the case
I assume it's for net-next, please put a "net" or "net-next"
indication (next-time)
Or.
>
>
> This patch passes the pci_dev_data to __mlx4_init_one().
>
> Signed-off-by: Wei Yang <weiyang@...ux.vnet.ibm.com>
> ---
> drivers/net/ethernet/mellanox/mlx4/main.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
> index d711158..9ffce06 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/main.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/main.c
> @@ -2670,7 +2670,13 @@ static pci_ers_result_t mlx4_pci_err_detected(struct pci_dev *pdev,
>
> static pci_ers_result_t mlx4_pci_slot_reset(struct pci_dev *pdev)
> {
> - int ret = __mlx4_init_one(pdev, 0);
> + int ret;
> + struct mlx4_dev *dev = pci_get_drvdata(pdev);
> + struct mlx4_priv *priv = mlx4_priv(dev);
> + int pci_dev_data;
> +
> + pci_dev_data = priv->pci_dev_data;
> + ret = __mlx4_init_one(pdev, pci_dev_data);
>
> return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;
> }
> --
> 1.7.9.5
>
> --
> 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
--
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