Index: /src/router/services/sysinit/defaults.c
===================================================================
--- /src/router/services/sysinit/defaults.c	(revision 9116)
+++ /src/router/services/sysinit/defaults.c	(revision 9117)
@@ -215,4 +215,6 @@
   {"wan_proto", "disabled", 0},	/* [static|dhcp|pppoe|disabled] */
 #endif
+#elif HAVE_DIR400
+  {"wan_proto", "dhcp", 0},	/* [static|dhcp|pppoe|disabled] */
 #elif HAVE_DIR300
   {"wan_proto", "dhcp", 0},	/* [static|dhcp|pppoe|disabled] */
@@ -958,5 +960,5 @@
   {"block_activex", "0", 0},	/* Block ActiveX [1|0] */
   {"block_cookie", "0", 0},	/* Block Cookie [1|0] */
-  {"block_multicast", "0", 0},	/* Multicast Pass Through [1|0] */
+  {"block_multicast", "1", 0},	/* Multicast Pass Through [1|0] */
   {"block_loopback", "0", 0},	/* Block NAT loopback [1|0] */
   {"ipsec_pass", "1", 0},	/* IPSec Pass Through [1|0] */
@@ -972,5 +974,5 @@
   {"block_activex", "0", 0},	/* Block ActiveX [1|0] */
   {"block_cookie", "0", 0},	/* Block Cookie [1|0] */
-  {"block_multicast", "0", 0},	/* Multicast Pass Through [1|0] */
+  {"block_multicast", "1", 0},	/* Multicast Pass Through [1|0] */
   {"block_loopback", "0", 0},	/* Block NAT loopback [1|0] */
   {"ipsec_pass", "1", 0},	/* IPSec Pass Through [1|0] */
@@ -986,5 +988,5 @@
   {"block_activex", "0", 0},	/* Block ActiveX [1|0] */
   {"block_cookie", "0", 0},	/* Block Cookie [1|0] */
-  {"block_multicast", "0", 0},	/* Multicast Pass Through [1|0] */
+  {"block_multicast", "1", 0},	/* Multicast Pass Through [1|0] */
   {"block_loopback", "0", 0},	/* Block NAT loopback [1|0] */
   {"ipsec_pass", "1", 0},	/* IPSec Pass Through [1|0] */
@@ -999,5 +1001,5 @@
   {"block_activex", "0", 0},	/* Block ActiveX [1|0] */
   {"block_cookie", "0", 0},	/* Block Cookie [1|0] */
-  {"block_multicast", "0", 0},	/* Multicast Pass Through [1|0] */
+  {"block_multicast", "1", 0},	/* Multicast Pass Through [1|0] */
   {"block_loopback", "0", 0},	/* Block NAT loopback [1|0] */
   {"ipsec_pass", "1", 0},	/* IPSec Pass Through [1|0] */
Index: /src/router/services/tools/site_survey_broadcom.c
===================================================================
--- /src/router/services/tools/site_survey_broadcom.c	(revision 9116)
+++ /src/router/services/tools/site_survey_broadcom.c	(revision 9117)
@@ -50,4 +50,5 @@
   uint16 beacon_period;		/* units are Kusec */
   uint16 capability;		/* Capability information */
+//  unsigned char athcaps;
   unsigned char ENCINFO[32];	/* encryption info */
   uint rate_count;		/* # rates in this set */
Index: /src/router/services/tools/site_survey_madwifi.c
===================================================================
--- /src/router/services/tools/site_survey_madwifi.c	(revision 9116)
+++ /src/router/services/tools/site_survey_madwifi.c	(revision 9117)
@@ -105,4 +105,5 @@
   unsigned short beacon_period;	/* units are Kusec */
   unsigned short capability;	/* Capability information */
+//  unsigned char athcaps;
   unsigned char ENCINFO[32];	/* encryption info */
   int rate_count;		/* # rates in this set */
@@ -165,4 +166,5 @@
 	(int) site_survey_lists[i].phy_noise + (int) sr->isr_rssi;
       site_survey_lists[i].capability = sr->isr_capinfo;
+//      site_survey_lists[i].athcaps = sr->isr_athflags;
       site_survey_lists[i].rate_count = sr->isr_nrates;
       cp += sr->isr_len, len -= sr->isr_len;