diff options
| author | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-08-15 14:52:59 +0000 |
|---|---|---|
| committer | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-08-15 14:52:59 +0000 |
| commit | a9499e2a7ffc9dd26b12b4d33d96e13144f21fd9 (patch) | |
| tree | 64b39622f0cb14b73ba1a88a44484dc99992b043 | |
| parent | adb7c3ff06a06d13be9417d32e0db1e4f5784831 (diff) | |
| parent | c1523470f35d1bcfb101868a122fa93165606ab3 (diff) | |
| download | xen-a9499e2a7ffc9dd26b12b4d33d96e13144f21fd9.tar.gz xen-a9499e2a7ffc9dd26b12b4d33d96e13144f21fd9.tar.bz2 xen-a9499e2a7ffc9dd26b12b4d33d96e13144f21fd9.zip | |
merge
| -rw-r--r-- | linux-2.6-xen-sparse/arch/xen/kernel/reboot.c | 1 | ||||
| -rw-r--r-- | linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c index 585c94e282..d11eb8987a 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c @@ -15,6 +15,7 @@ #include <asm-xen/linux-public/suspend.h> #include <asm-xen/queues.h> #include <asm-xen/xenbus.h> +#include <asm-xen/ctrl_if.h> #define SHUTDOWN_INVALID -1 #define SHUTDOWN_POWEROFF 0 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 742c3fd46c..0c72a408bf 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c @@ -386,7 +386,10 @@ static void network_tx_buf_gc(struct net_device *dev) mb(); } while (prod != np->tx->resp_prod); +#ifdef CONFIG_XEN_NETDEV_GRANT_TX out: +#endif + if (np->tx_full && ((np->tx->req_prod - prod) < NETIF_TX_RING_SIZE)) { np->tx_full = 0; if (np->user_state == UST_OPEN) |