From 728a602aa8325ce0948dc53b6e7c7cce7d6a9aac Mon Sep 17 00:00:00 2001 From: Timo von Holtz Date: Tue, 8 Feb 2011 15:55:49 +0100 Subject: [PATCH] --- yaml --- r: 235891 b: refs/heads/master c: 581de3b0a538aa18181602008aa222f51dcf1ec3 h: refs/heads/master i: 235889: ffcf0fcae148ed7bef129bbd5a199f1bf0214050 235887: b2ee6efeee99c74f3b8b09299af60ce2cc245929 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/netvsc_drv.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 761c71eafbe4..8f0be0f3dda4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c4a94132b78f3143ef8f63f8450d2385dafb429 +refs/heads/master: 581de3b0a538aa18181602008aa222f51dcf1ec3 diff --git a/trunk/drivers/staging/hv/netvsc_drv.c b/trunk/drivers/staging/hv/netvsc_drv.c index 95fa810255ed..6b8fd0c2b0da 100644 --- a/trunk/drivers/staging/hv/netvsc_drv.c +++ b/trunk/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 */