diff -ur pcmcia-cs-3.0.11/clients/wavelan_cs.c pcmcia-cs-3.0.11.mine/clients/wavelan_cs.c
--- pcmcia-cs-3.0.11/clients/wavelan_cs.c	Fri May 14 13:31:21 1999
+++ pcmcia-cs-3.0.11.mine/clients/wavelan_cs.c	Wed Jun  2 08:54:28 1999
@@ -785,9 +785,9 @@
   unsigned short sigqual=stats[2] & MMR_SGNL_QUAL;   /* SNR of beacon */
   wavepoint_history *wavepoint=NULL;                /* WavePoint table entry */
   net_local *lp=(net_local *)dev->priv;              /* Device info */
-
+#ifndef WAVELAN_ROAMING
   nwid=nwid^ntohs(beacon->domain_id);
-
+#endif
 #if WAVELAN_ROAMING_DEBUG > 1
   printk(KERN_DEBUG "WaveLAN: beacon, dev %s:\n",dev->name);
   printk(KERN_DEBUG "Domain: %.4X NWID: %.4X SigQual=%d\n",ntohs(beacon->domain_id),nwid,sigqual);
diff -ur pcmcia-cs-3.0.11/clients/wavelan_cs.h pcmcia-cs-3.0.11.mine/clients/wavelan_cs.h
--- pcmcia-cs-3.0.11/clients/wavelan_cs.h	Sat May 15 04:06:52 1999
+++ pcmcia-cs-3.0.11.mine/clients/wavelan_cs.h	Wed Jun  2 08:55:26 1999
@@ -382,7 +382,7 @@
  * `#define' or `#undef' the following constant to change the behaviour
  * of the driver...
  */
-#undef WAVELAN_ROAMING		/* Include experimental roaming code */
+#define WAVELAN_ROAMING		/* Include experimental roaming code */
 #undef SET_PSA_CRC		/* Set the CRC in PSA (slower) */
 #define USE_PSA_CONFIG		/* Use info from the PSA */
 #undef STRUCT_CHECK		/* Verify padding of structures */