[Xen-changelog] Fix rx buffer allocation in netfront. The final allocation size

[Xen patchbot -3.0-testing <patchbot-3.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 4ad23e7987983befc004b5e6bbb5f5f04b0907e1
# Parent  a91e4dcf629d502f2925003375d64ab51a148b97
Fix rx buffer allocation in netfront. The final allocation size
was ending up bigger than PAGE_SIZE.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

xen-unstable cset: 7f2ccea5a4ec96af72e83c13ee25845e5d2cbb61
committer: Robert Read <robert@xxxxxxxxxxxxx>

diff -r a91e4dcf629d -r 4ad23e798798 
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Fri Dec 23 
01:12:41 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Mon Dec 12 
18:47:47 2005
@@ -540,8 +540,8 @@
                 * tailroom then round down to SKB_DATA_ALIGN boundary.
                 */
                skb = alloc_xen_skb(
-                       (PAGE_SIZE - 16 - sizeof(struct skb_shared_info)) &
-                       (-SKB_DATA_ALIGN(1)));
+                       ((PAGE_SIZE - sizeof(struct skb_shared_info)) &
+                        (-SKB_DATA_ALIGN(1))) - 16);
                if (skb == NULL)
                        break;
                __skb_queue_tail(&np->rx_batch, skb);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog