Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen-netfront: frags -> slots in xennet_get_responses

Browse Source 
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>
This commit is contained in:
Wei Liu 2013-03-25 01:08:19 +00:00 committed by David S. Miller
parent e2d617c0cc
commit 7158ff6d0c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/xen-netfront.c
View File

@ -712,7 +712,7 @@ static int xennet_get_responses(struct netfront_info *np,
struct sk_buff *skb = xennet_get_rx_skb(np, cons); struct sk_buff *skb = xennet_get_rx_skb(np, cons);
grant_ref_t ref = xennet_get_rx_ref(np, cons); grant_ref_t ref = xennet_get_rx_ref(np, cons);
int max = MAX_SKB_FRAGS + (rx->status <= RX_COPY_THRESHOLD); int max = MAX_SKB_FRAGS + (rx->status <= RX_COPY_THRESHOLD);
int frags = 1; int slots = 1;
int err = 0; int err = 0;
unsigned long ret; unsigned long ret;
@ -756,27 +756,27 @@ next:
if (!(rx->flags & XEN_NETRXF_more_data)) if (!(rx->flags & XEN_NETRXF_more_data))
break; break;
if (cons + frags == rp) { if (cons + slots == rp) {
if (net_ratelimit()) if (net_ratelimit())
dev_warn(dev, "Need more frags\n"); dev_warn(dev, "Need more slots\n");
err = -ENOENT; err = -ENOENT;
break; break;
} }
rx = RING_GET_RESPONSE(&np->rx, cons + frags); rx = RING_GET_RESPONSE(&np->rx, cons + slots);
skb = xennet_get_rx_skb(np, cons + frags); skb = xennet_get_rx_skb(np, cons + slots);
ref = xennet_get_rx_ref(np, cons + frags); ref = xennet_get_rx_ref(np, cons + slots);
frags++; slots++;
} }
if (unlikely(frags > max)) { if (unlikely(slots > max)) {
if (net_ratelimit()) if (net_ratelimit())
dev_warn(dev, "Too many frags\n"); dev_warn(dev, "Too many frags\n");
err = -E2BIG; err = -E2BIG;
} }
if (unlikely(err)) if (unlikely(err))
np->rx.rsp_cons = cons + frags; np->rx.rsp_cons = cons + slots;
return err; return err;
} }