From b3f968c23ddee3b35d2ad013e39c75578155ec5f Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 25 Mar 2013 01:08:19 +0000 Subject: [PATCH] --- yaml --- r: 368655 b: refs/heads/master c: 7158ff6d0c6aa3724fb51c6c11143d31e166eb1f h: refs/heads/master i: 368653: a317606a5f9c12a2f465935f43e7abcc4d0578fc 368651: 540f4b3eee91d1186553c289452d92414f6f1902 368647: 278d190ad4ccbfa7b6429fcec9d759b87865493a 368639: ff4a465ba38176aa367ab3b50ff460f3fac2aee4 v: v3 --- [refs] | 2 +- trunk/drivers/net/xen-netfront.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index cbd9588c336e..faf7ccbb1b6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2d617c0ccf658a55552955f07018ecfa0135210 +refs/heads/master: 7158ff6d0c6aa3724fb51c6c11143d31e166eb1f diff --git a/trunk/drivers/net/xen-netfront.c b/trunk/drivers/net/xen-netfront.c index 55276635e69b..d9097a786962 100644 --- a/trunk/drivers/net/xen-netfront.c +++ b/trunk/drivers/net/xen-netfront.c @@ -712,7 +712,7 @@ static int xennet_get_responses(struct netfront_info *np, struct sk_buff *skb = xennet_get_rx_skb(np, cons); grant_ref_t ref = xennet_get_rx_ref(np, cons); int max = MAX_SKB_FRAGS + (rx->status <= RX_COPY_THRESHOLD); - int frags = 1; + int slots = 1; int err = 0; unsigned long ret; @@ -756,27 +756,27 @@ static int xennet_get_responses(struct netfront_info *np, if (!(rx->flags & XEN_NETRXF_more_data)) break; - if (cons + frags == rp) { + if (cons + slots == rp) { if (net_ratelimit()) - dev_warn(dev, "Need more frags\n"); + dev_warn(dev, "Need more slots\n"); err = -ENOENT; break; } - rx = RING_GET_RESPONSE(&np->rx, cons + frags); - skb = xennet_get_rx_skb(np, cons + frags); - ref = xennet_get_rx_ref(np, cons + frags); - frags++; + rx = RING_GET_RESPONSE(&np->rx, cons + slots); + skb = xennet_get_rx_skb(np, cons + slots); + ref = xennet_get_rx_ref(np, cons + slots); + slots++; } - if (unlikely(frags > max)) { + if (unlikely(slots > max)) { if (net_ratelimit()) dev_warn(dev, "Too many frags\n"); err = -E2BIG; } if (unlikely(err)) - np->rx.rsp_cons = cons + frags; + np->rx.rsp_cons = cons + slots; return err; }