2011-03-02 17:36:14

by Toralf Förster

Subject: [PATCH] ./drivers/staging/hv/netvsc_drv.c: no assignment within if + whitespace clean up

This patch fixes all complaints of checkpatch.pl.

A typo slipped in in the 1st attempt of this patch.
This patch corrects it.

Signed-off-by: Toralf Förster <[email protected]>
---
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);
}
}

@@ -207,7 +208,8 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
net->stats.tx_packets,
net->stats.tx_bytes);

- if ((net_device_ctx->avail -= num_pages) < PACKET_PAGES_LOWATER)
+ net_device_ctx->avail -= num_pages;
+ if (net_device_ctx->avail < PACKET_PAGES_LOWATER)
netif_stop_queue(net);
} else {
/* we are shutting down or bus overloaded, just drop packet */
--
1.7.4.1

2011-03-02 20:59:49

by Greg KH

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 <[email protected]>
> ---
> 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