]> xenbits.xensource.com Git - people/ssmith/nc2-2.6.27.git/commitdiff
commit 7b7e58bdbea41a8ab40b1b3e8ec35cb4e1d42c53
authorSteven Smith <ssmith@weybridge.uk.xensource.com>
Fri, 19 Jun 2009 14:35:20 +0000 (15:35 +0100)
committerSteven Smith <ssmith@weybridge.uk.xensource.com>
Tue, 30 Jun 2009 12:02:14 +0000 (13:02 +0100)
Author: Jose Renato Santos <jsantos@hpl.hp.com>
Date:   Wed Jun 17 10:34:18 2009 -0700

    Fix calculation of maximum skb head size in netchannel2. We need
    to use (SMP_CACHE_BYTES - 1) instead of (SMP_CACHE_BYTES).

Signed-off-by: Jose Renato Santos <jsantos@hpl.hp.com>
drivers/xen/netchannel2/rscb.c

index 985e4760ad748cb14383c89ba8211664e6d652af..038086c8f29ef1a7d435030a3b5011fde72da3c8 100644 (file)
@@ -209,7 +209,8 @@ struct sk_buff *handle_receiver_copy_packet(struct netchannel2 *nc,
            hypercalls. */
         skb_headsize = nr_bytes + NET_IP_ALIGN;
         if (skb_headsize >
-            ((PAGE_SIZE - sizeof(struct skb_shared_info) - NET_SKB_PAD) & ~(SMP_CACHE_BYTES))) {
+            ((PAGE_SIZE - sizeof(struct skb_shared_info) - NET_SKB_PAD) & 
+            ~(SMP_CACHE_BYTES - 1))) {
                 skb_headsize = msg->prefix_size + NET_IP_ALIGN;
         }