Re: linux-next: manual merge of the net-next tree with Linus' tree

[Stephen Rothwell]

Hi Jeff,

On Tue, 17 Dec 2013 17:56:09 -0800 Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx> wrote:
>
> Your fix is fine, what I have in my tree is the following, so if you
> want to modify your change so that the resultant code looks like this:
> 
>         struct rtnl_link_stats64 *vsi_stats =
> i40e_get_vsi_stats_struct(vsi);
>         int i;
>   
>         if (test_bit(__I40E_DOWN, &vsi->state))
>                return stats;
> 
>         if (!vsi->tx_rings)
>                return stats;
>   
>         rcu_read_lock();
>         for (i = 0; i < vsi->num_queue_pairs; i++) {

OK, I updated my rerere cache, so it will look like that tomorrow.

Thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature