summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo von Holtz <tvh@informatik.uni-kiel.de>2011-02-08 15:55:49 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-09 12:11:55 -0800
commit581de3b0a538aa18181602008aa222f51dcf1ec3 (patch)
treeb4707bb77a18d75206d2021aa37dc3aea5d337c1
parent3c4a94132b78f3143ef8f63f8450d2385dafb429 (diff)
Staging: hv: moved assignments out of if conditions
Moved all assignments in if conditions to the preceeding line Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de> Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/hv/netvsc_drv.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 95fa810255e..6b8fd0c2b0d 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -126,7 +126,8 @@ static void netvsc_xmit_completion(void *context)
dev_kfree_skb_any(skb);
- if ((net_device_ctx->avail += num_pages) >= PACKET_PAGES_HIWATER)
+ 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 */