Date: Wed, 2 Mar 2011 16:00:20 -0500
From: Greg KH <greg@kroah.com>
To: Toralf =?iso-8859-1?Q?F=F6rster?= <toralf.foerster@gmx.de>
Cc: gregkh@suse.de, haiyangz@microsoft.com, hjanssen@microsoft.com,
        linux-kernel@vger.kernel.org
Subject: Re: Staging: hv: netvsc_drv.c: no assignment within if +
 whitespace clean up
Message-ID: <20110302210020.GA20485@kroah.com>
References: <1299087367-7580-1-git-send-email-toralf.foerster@gmx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <1299087367-7580-1-git-send-email-toralf.foerster@gmx.de>
User-Agent: Mutt/1.5.20 (2009-06-14)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1335
Lines: 37

On Wed, Mar 02, 2011 at 06:36:07PM +0100, Toralf F?rster wrote:
> This patch fixes all complaints of checkpatch.pl.
> 
> Signed-off-by: Toralf F?rster <toralf.foerster@gmx.de>
> ---
>  drivers/staging/hv/netvsc_drv.c |    8 +++++---
>  1 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
> index b41c964..2f3a9e9 100644
> --- a/drivers/staging/hv/netvsc_drv.c
> +++ b/drivers/staging/hv/netvsc_drv.c
> @@ -126,8 +126,9 @@ static void netvsc_xmit_completion(void *context)
>  
>  		dev_kfree_skb_any(skb);
>  
> -		if ((net_device_ctx->avail += num_pages) >= PACKET_PAGES_HIWATER)
> -			netif_wake_queue(net);
> +		net_device_ctx->avail += num_pages;
> +		if (net_device_ctx->avail >= PACKET_PAGES_HIWATER)
> +			netif_wake_queue(net);

This fix is already in the linux-next tree, what tree did you diff this
against?

You can't make staging tree cleanups against Linus's tree, sorry, they
need to be against linux-next in order to properly get all of the
pending patches already queued up.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/