Patchwork netback: fix multi page ring size calculation.

login
register
mail settings
Submitter Wei Liu
Date Jan. 26, 2012, 5:20 p.m.
Message ID <1327598408-16214-1-git-send-email-wei.liu2@citrix.com>
Download mbox | patch
Permalink /patch/137988/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Wei Liu - Jan. 26, 2012, 5:20 p.m.
---
 drivers/net/xen-netback/common.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Wei Liu - Jan. 26, 2012, 5:21 p.m.
Sorry for the noise, I accidently sent the wrong patch.

Wei.

On Thu, 2012-01-26 at 17:20 +0000, Wei Liu wrote:
> ---
>  drivers/net/xen-netback/common.h |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
> index 477e5ab..f3d95b3 100644
> --- a/drivers/net/xen-netback/common.h
> +++ b/drivers/net/xen-netback/common.h
> @@ -60,9 +60,9 @@ struct xenvif_rx_meta {
>  #define MAX_BUFFER_OFFSET PAGE_SIZE
>  
>  #define NETBK_TX_RING_SIZE(_nr_pages)					\
> -	(__CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE) * (_nr_pages))
> +	(__CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE * (_nr_pages)))
>  #define NETBK_RX_RING_SIZE(_nr_pages)					\
> -	(__CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE) * (_nr_pages))
> +	(__CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE * (_nr_pages)))
>  
>  #define NETBK_MAX_RING_PAGE_ORDER 2
>  #define NETBK_MAX_RING_PAGES      (1U << NETBK_MAX_RING_PAGE_ORDER)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
index 477e5ab..f3d95b3 100644
--- a/drivers/net/xen-netback/common.h
+++ b/drivers/net/xen-netback/common.h
@@ -60,9 +60,9 @@  struct xenvif_rx_meta {
 #define MAX_BUFFER_OFFSET PAGE_SIZE
 
 #define NETBK_TX_RING_SIZE(_nr_pages)					\
-	(__CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE) * (_nr_pages))
+	(__CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE * (_nr_pages)))
 #define NETBK_RX_RING_SIZE(_nr_pages)					\
-	(__CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE) * (_nr_pages))
+	(__CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE * (_nr_pages)))
 
 #define NETBK_MAX_RING_PAGE_ORDER 2
 #define NETBK_MAX_RING_PAGES      (1U << NETBK_MAX_RING_PAGE_ORDER)