From ae923914c6a7c0857885e2874111de1f06b718e4 Mon Sep 17 00:00:00 2001 From: "smh22@firebug.cl.cam.ac.uk" Date: Sun, 14 Aug 2005 22:56:46 +0000 Subject: Build fixes for grant tables. Signed-off-by: Steven Hand --- linux-2.6-xen-sparse/drivers/xen/netback/interface.c | 6 ------ linux-2.6-xen-sparse/drivers/xen/netback/netback.c | 3 ++- linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/interface.c b/linux-2.6-xen-sparse/drivers/xen/netback/interface.c index acf5f80540..8326915220 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netback/interface.c +++ b/linux-2.6-xen-sparse/drivers/xen/netback/interface.c @@ -383,12 +383,6 @@ void netif_connect(netif_be_connect_t *connect) 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 --git a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c index 038b5e3e75..0de0b0b064 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c @@ -55,6 +55,8 @@ static DECLARE_TASKLET(net_rx_tasklet, net_rx_action, 0); 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 @@ static unsigned char rx_notify[NR_EVENT_CHANNELS]; /* 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 --git a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c index 7c78eb1ec4..742c3fd46c 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c @@ -356,7 +356,7 @@ static void network_tx_buf_gc(struct net_device *dev) 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 " -- cgit v1.2.3