From 0766b299e849f4423383e61603578bbe64919682 Mon Sep 17 00:00:00 2001 From: HIRANO Takahito Date: Thu, 1 May 2008 01:58:24 +0900 Subject: [PATCH] UBUNTU: Fix incomplete commit 294d61f7b574d2909aec6017ab2333b26d6314c5 Signed-off-by: HIRANO Takahito --- .../xen/patchset/004-xen-net-fix.patch | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/binary-custom.d/xen/patchset/004-xen-net-fix.patch b/debian/binary-custom.d/xen/patchset/004-xen-net-fix.patch index 996991b..1c9d82b 100644 --- a/debian/binary-custom.d/xen/patchset/004-xen-net-fix.patch +++ b/debian/binary-custom.d/xen/patchset/004-xen-net-fix.patch @@ -1,6 +1,6 @@ -diff -Naur ubuntu-hardy-xen/drivers/xen/netfront/netfront.c ubuntu-hardy-xen-new/drivers/xen/netfront/netfront.c ---- ubuntu-hardy-xen/drivers/xen/netfront/netfront.c 2008-04-21 09:16:12.000000000 -0400 -+++ ubuntu-hardy-xen-new/drivers/xen/netfront/netfront.c 2008-04-21 09:37:02.000000000 -0400 +diff -Naur ubuntu-hardy-xen/drivers/xen/netfront/netfront.c ubuntu-hardy-xen-fix/drivers/xen/netfront/netfront.c +--- ubuntu-hardy-xen/drivers/xen/netfront/netfront.c 2008-05-01 00:36:25.000000000 +0900 ++++ ubuntu-hardy-xen-fix/drivers/xen/netfront/netfront.c 2008-04-30 23:07:53.000000000 +0900 @@ -622,6 +622,7 @@ struct netfront_info *np = netdev_priv(dev); @@ -18,16 +18,18 @@ diff -Naur ubuntu-hardy-xen/drivers/xen/netfront/netfront.c ubuntu-hardy-xen-new /* After all PTEs have been zapped, flush the TLB. */ np->rx_mcl[i-1].args[MULTI_UVMFLAGS_INDEX] = UVMF_TLB_FLUSH|UVMF_ALL; -@@ -847,7 +850,8 @@ +@@ -847,8 +850,9 @@ /* Check return status of HYPERVISOR_memory_op(). */ if (unlikely(np->rx_mcl[i].result != i)) panic("Unable to reduce memory reservation\n"); - while (i--) +- BUG_ON(np->rx_mcl[i].result); + j = i; + while (j--) - BUG_ON(np->rx_mcl[i].result); ++ BUG_ON(np->rx_mcl[j].result); } else { if (HYPERVISOR_memory_op(XENMEM_decrease_reservation, + &reservation) != i) @@ -1671,6 +1675,7 @@ static int network_close(struct net_device *dev) { -- 1.5.4.3