xen-netfront: frags -> slots in xennet_get_responses

This function is in fact counting the ring slots required for responses.
Separate the concepts of ring slots and skb frags make the code clearer, as
now netfront and netback can have different MAX_SKB_FRAGS, slot and frag are
not mapped 1:1 any more.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 55276635e69b13fdf13724c46ae359fe35216bd2..d9097a786962ad4c487d01cff7f71321540d1762 100644 (file)
--- a/drivers/net/xen-netfront.c
+++ b/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 @@ next:
                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;
 }