[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20110302210020.GA20485@kroah.com>
Date: Wed, 2 Mar 2011 16:00:20 -0500
From: Greg KH <greg@...ah.com>
To: Toralf Förster <toralf.foerster@....de>
Cc: gregkh@...e.de, haiyangz@...rosoft.com, hjanssen@...rosoft.com,
linux-kernel@...r.kernel.org
Subject: Re: Staging: hv: netvsc_drv.c: no assignment within if +
whitespace clean up
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@....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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists