bitkeeper revision 1.955.1.2 (40c9fa70tPu0dbYE7l64lI-VfVdUYQ)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/var/bk/xeno-unstable.bk

diff --cc .rootkeys
Simple merge

diff --cc linux-2.4.26-xen-sparse/arch/xen/drivers/netif/frontend/main.c
index 821ad1b0ed9cfe4de0f91c8dd6562c0e220a041d,f7b58341a7dbb1de1fbd661a26df5346904e26f3..3481788bf74293d5c7a68ad339f71c792660780a
--- 1/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/frontend/main.c
--- 2/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/frontend/main.c
+++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/frontend/main.c
@@@ -697,12 -849,14 +849,14 @@@ static int __init init_module(void
  {
      ctrl_msg_t                       cmsg;
      netif_fe_driver_status_changed_t st;
-     int err;
-     struct net_device *dev;
-     struct net_private *np;
+     int err = 0;
+ #ifdef MULTIVIF
+     int wait_n = 20;
+     int wait_i;
+ #endif
  
 -    if ( start_info.flags & SIF_INITDOMAIN
 -         || start_info.flags & SIF_NET_BE_DOMAIN )
 +    if ( (start_info.flags & SIF_INITDOMAIN) ||
 +         (start_info.flags & SIF_NET_BE_DOMAIN) )
          return 0;
  
      printk("Initialising Xen virtual ethernet frontend driver");