[Xen-changelog] Build fixes for grant tables.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User smh22@xxxxxxxxxxxxxxxxxxxx
# Node ID 879ff416adccacbcd63e9785ae8d4bc8355d8600
# Parent  3076b3cc3048a1ca6d89568d3797754c288a8f79
Build fixes for grant tables.

Signed-off-by: Steven Hand <steven@xxxxxxxxxxxxx>

diff -r 3076b3cc3048 -r 879ff416adcc 
linux-2.6-xen-sparse/drivers/xen/netback/interface.c
--- a/linux-2.6-xen-sparse/drivers/xen/netback/interface.c      Sun Aug 14 
22:09:18 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/interface.c      Sun Aug 14 
22:56:46 2005
@@ -383,12 +383,6 @@
             return;
         }
 
-            DPRINTK(" Grant table operation failure !\n");
-            connect->status = NETIF_BE_STATUS_MAPPING_ERROR;
-            vfree(vma->addr);
-            return;
-        }
-
         netif->rx_shmem_ref    = rx_ref;
         netif->rx_shmem_handle = handle;
         netif->rx_shmem_vaddr  = VMALLOC_VMADDR(vma->addr) + PAGE_SIZE;
diff -r 3076b3cc3048 -r 879ff416adcc 
linux-2.6-xen-sparse/drivers/xen/netback/netback.c
--- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c        Sun Aug 14 
22:09:18 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c        Sun Aug 14 
22:56:46 2005
@@ -55,6 +55,8 @@
 
 static struct timer_list net_timer;
 
+#define MAX_PENDING_REQS 256
+
 static struct sk_buff_head rx_queue;
 static multicall_entry_t rx_mcl[NETIF_RX_RING_SIZE*2+1];
 static mmu_update_t rx_mmu[NETIF_RX_RING_SIZE];
@@ -68,7 +70,6 @@
 /* Don't currently gate addition of an interface to the tx scheduling list. */
 #define tx_work_exists(_if) (1)
 
-#define MAX_PENDING_REQS 256
 static unsigned long mmap_vstart;
 #define MMAP_VADDR(_req) (mmap_vstart + ((_req) * PAGE_SIZE))
 
diff -r 3076b3cc3048 -r 879ff416adcc 
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Sun Aug 14 
22:09:18 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Sun Aug 14 
22:56:46 2005
@@ -356,7 +356,7 @@
             id  = np->tx->ring[MASK_NETIF_TX_IDX(i)].resp.id;
             skb = np->tx_skbs[id];
 #ifdef CONFIG_XEN_NETDEV_GRANT_TX
-            if (unlikey(gnttab_query_foreign_access(grant_tx_ref[id]) != 0)) {
+            if (unlikely(gnttab_query_foreign_access(grant_tx_ref[id]) != 0)) {
                 /* other domain is still using this grant - shouldn't happen
                    but if it does, we'll try to reclaim the grant later */
                 printk(KERN_ALERT "network_tx_buf_gc: warning -- grant "

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