Changeset 12147

Timestamp:

05/18/09 17:01:30 (4 years ago)

Author:

BrainSlayer

Message:

need to rebuild. these fix broke the build

Location:

src/router/services

Files:

• Makefile (modified) (3 diffs)
• sysinit/defaults.c (modified) (1 diff)
• sysinit/switchlib/icplus.c (modified) (2 diffs)
• sysinit/sysinit-dir300.c (modified) (2 diffs)
• sysinit/sysinit-ls2.c (modified) (4 diffs)

src/router/services/Makefile

@@ -72 +72 @@
 CFLAGS += -DHAVE_ACK
 endif
+ifeq ($(CONFIG_SWCONFIG),y)
+CFLAGS += -DHAVE_SWCONFIG
+endif
 ifeq ($(CONFIG_DEFAULT_COUNTRYCODE),JP)
   CFLAGS += -DBUFFALO_JP
@@ -372 +375 @@
 CFLAGS += -DHAVE_FONERA
 CFLAGS += -DHAVE_DIR400
-#OBJS += icplus.o
+OBJS += icplus.o
 else
 ifeq ($(CONFIG_DIR300),y)
 CFLAGS += -DHAVE_FONERA
 CFLAGS += -DHAVE_DIR300
-#OBJS += icplus.o
+OBJS += icplus.o
 endif
 endif
@@ -433 +436 @@
 ifeq ($(CONFIG_LS2),y)
 CFLAGS += -DHAVE_LS2
-#OBJS += icplus.o
+OBJS += icplus.o
 endif
 endif

src/router/services/sysinit/defaults.c

@@ -167 +167 @@
 #elif HAVE_GGEW
 #ifdef HAVE_NS5
+    {"ath0_regdomain", "GERMANY_BFWA", 0},      /* LAN IP address */
+#elif HAVE_EOC5610
     {"ath0_regdomain", "GERMANY_BFWA", 0},      /* LAN IP address */
 #elif HAVE_NS2

src/router/services/sysinit/switchlib/icplus.c

@@ -248 +248 @@
 #define IP_IS_WAN_PORT(port) ((port) == IP_WAN_PORT)
 
-#define IP_LAN_PORT_VLAN          0
+#define IP_LAN_PORT_VLAN          1
 #define IP_WAN_PORT_VLAN          2
 
@@ -565 +565 @@
 
     eval( "vconfig", "set_name_type", "VLAN_PLUS_VID_NO_PAD" );
-    eval( "vconfig", "add", "eth0", "0" );
+    eval( "vconfig", "add", "eth0", "1" );
     eval( "vconfig", "add", "eth0", "2" );
     struct ifreq ifr;

src/router/services/sysinit/sysinit-dir300.c

@@ -287 +287 @@
 //      system("swconfig dev eth0 set reset 1");
 //      system("swconfig dev eth0 set enable_vlan 1");
+#ifdef HAVE_SWCONFIG
         system("swconfig dev eth0 vlan 1 set ports \"0 1 2 3 5t\"");
         system("swconfig dev eth0 vlan 2 set ports \"4 5t\"");
@@ -294 +295 @@
         eval( "vconfig", "add", "eth0", "2" );
 //      set network.eth0_1.ports="0 1 2 3 5t"
-//      vlan_init( 0xff );      // 4 lan + 1 wan
+#else
+        vlan_init( 0xff );      // 4 lan + 1 wan
+#endif
     struct ifreq ifr;
     int s;

src/router/services/sysinit/sysinit-ls2.c

@@ -39 +39 @@
 #include <sys/utsname.h>
 #include <sys/wait.h>
+#include <linux/if_ether.h>
+#include <linux/mii.h>
+#include <linux/sockios.h>
+#include <net/if.h>
+
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <linux/sockios.h>
+#include <linux/mii.h>
 
 #include <bcmnvram.h>
@@ -133 +142 @@
 #ifdef HAVE_BWRG1000
     eval( "ifconfig", "eth0", "up" );   // wan
+#ifdef HAVE_SWCONFIG
     system("swconfig dev eth0 vlan 1 set ports \"0 1 2 3 5t\"");
     system("swconfig dev eth0 vlan 2 set ports \"4 5t\"");
@@ -140 +150 @@
     eval( "vconfig", "add", "eth0", "2" );
 #else
+        vlan_init( 0xff );      // 4 lan + 1 wan
+#endif
+#else
 #ifdef HAVE_LS2
 #if !defined(HAVE_NS2) && !defined(HAVE_BS2) && !defined(HAVE_LC2) && !defined(HAVE_BS2HP) && !defined(HAVE_MS2) && !defined(HAVE_PICO2) && !defined(HAVE_PICO2HP)
     eval( "ifconfig", "eth0", "up" );   // wan
-//      system("swconfig dev eth0 set reset 1");
-//      system("swconfig dev eth0 set enable_vlan 1");
+#ifdef HAVE_SWCONFIG
         system("swconfig dev eth0 vlan 1 set ports \"0 1 2 3 5t\"");
         system("swconfig dev eth0 vlan 2 set ports \"4 5t\"");
@@ -151 +163 @@
         eval( "vconfig", "add", "eth0", "1" );
         eval( "vconfig", "add", "eth0", "2" );
-//      set network.eth0_1.ports="0 1 2 3 5t"
-//      vlan_init( 0xff );      // 4 lan + 1 wan
+#else
+        vlan_init( 0xff );      // 4 lan + 1 wan
+#endif
     struct ifreq ifr;
     int s;