Subject: Re: linux-next: manual merge of the net tree with the net-current tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 9 Mar 2011 11:11:13 +1100

Hi Dmitry,

On Tue, 8 Mar 2011 11:44:33 +0200 "Dmitry Kravkov" <[email-masked]> wrote:
>
> You are correct it's just an addition and it does not really matter
> where to do this. But the merge pushed new code in the middle
> of MAC configuration between MAC and multicast list.
> It's clearer to put it at the end of MAC/ML/UL block:
> ---
>  drivers/net/bnx2x/bnx2x_cmn.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
> index b01b622..9e37675 100644
> --- a/drivers/net/bnx2x/bnx2x_cmn.c
> +++ b/drivers/net/bnx2x/bnx2x_cmn.c
> @@ -1498,6 +1498,11 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
>  	/* Clear UC lists configuration */
>  	bnx2x_invalidate_uc_list(bp);
>  
> +	if (bp->pending_max) {
> +		bnx2x_update_max_mf_config(bp, bp->pending_max);
> +		bp->pending_max = 0;
> +	}
> +
>  	if (bp->port.pmf)
>  		bnx2x_initial_phy_init(bp, load_mode);

OK, thanks.  I have changed the conflict resolution to do that.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/