Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235891
b: refs/heads/master
c: 581de3b
h: refs/heads/master
i:
  235889: ffcf0fc
  235887: b2ee6ef
v: v3
  • Loading branch information
Timo von Holtz authored and Greg Kroah-Hartman committed Feb 9, 2011
1 parent f432b34 commit 728a602
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3c4a94132b78f3143ef8f63f8450d2385dafb429
refs/heads/master: 581de3b0a538aa18181602008aa222f51dcf1ec3
6 changes: 4 additions & 2 deletions trunk/drivers/staging/hv/netvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 728a602

Please sign in to comment.