Hi,
Those 2 patches was originally part of the Xen 64KB series [1]. They are
already acked/reviewed and can go in Linux via the net tree now
without waiting the rest of the series.
Sincerely yours,
Cc: Wei Liu <[email protected]>
Cc: Ian Campbell <[email protected]>
Cc: David Vrabel <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Boris Ostrovsky <[email protected]>
Cc: [email protected]
[1] http://lkml.org/lkml/2015/5/14/533
Julien Grall (2):
net/xen-netfront: Correct printf format in xennet_get_responses
net/xen-netback: Remove unused code in xenvif_rx_action
drivers/net/xen-netback/netback.c | 5 -----
drivers/net/xen-netfront.c | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
--
2.1.4
rx->status is an int16_t, print it using %d rather than %u in order to
have a meaningful value when the field is negative.
Also use %d rather than %x for rx->offset.
Signed-off-by: Julien Grall <[email protected]>
Reviewed-by: David Vrabel <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Boris Ostrovsky <[email protected]>
Cc: [email protected]
---
Changes in v3:
- Use %d for the rx-offset too.
Changes in v2:
- Add David's Reviewed-by
---
drivers/net/xen-netfront.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index e031c94..3c1ca8b 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -733,7 +733,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
if (unlikely(rx->status < 0 ||
rx->offset + rx->status > PAGE_SIZE)) {
if (net_ratelimit())
- dev_warn(dev, "rx->offset: %x, size: %u\n",
+ dev_warn(dev, "rx->offset: %d, size: %d\n",
rx->offset, rx->status);
xennet_move_rx_slot(queue, skb, ref);
err = -EINVAL;
--
2.1.4
The variables old_req_cons and ring_slots_used are assigned but never
used since commit 1650d5455bd2dc6b5ee134bd6fc1a3236c266b5b "xen-netback:
always fully coalesce guest Rx packets".
Signed-off-by: Julien Grall <[email protected]>
Acked-by: Wei Liu <[email protected]>
Cc: Ian Campbell <[email protected]>
Cc: [email protected]
---
Changes in v2:
- Add Wei's Acked-by
---
drivers/net/xen-netback/netback.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 0d25943..ba3ae30 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -515,14 +515,9 @@ static void xenvif_rx_action(struct xenvif_queue *queue)
while (xenvif_rx_ring_slots_available(queue, XEN_NETBK_RX_SLOTS_MAX)
&& (skb = xenvif_rx_dequeue(queue)) != NULL) {
- RING_IDX old_req_cons;
- RING_IDX ring_slots_used;
-
queue->last_rx_time = jiffies;
- old_req_cons = queue->rx.req_cons;
XENVIF_RX_CB(skb)->meta_slots_used = xenvif_gop_skb(skb, &npo, queue);
- ring_slots_used = queue->rx.req_cons - old_req_cons;
__skb_queue_tail(&rxq, skb);
}
--
2.1.4
From: Julien Grall <[email protected]>
Date: Thu, 4 Jun 2015 16:35:13 +0100
> rx->status is an int16_t, print it using %d rather than %u in order to
> have a meaningful value when the field is negative.
>
> Also use %d rather than %x for rx->offset.
>
> Signed-off-by: Julien Grall <[email protected]>
> Reviewed-by: David Vrabel <[email protected]>
> Cc: Konrad Rzeszutek Wilk <[email protected]>
> Cc: Boris Ostrovsky <[email protected]>
> Cc: [email protected]
>
> ---
> Changes in v3:
> - Use %d for the rx-offset too.
This change in v3 is wrong, 'rx->offset' is unsigned therefore %u is
the correct format string to use.