diff options
| -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) |