Skip to content

Commit 2d7ae2c

Browse files
committed
bridge eth0 and eth1. so two rj ports can be used for internet connection.
fix mac address bug for eth0 and eth1 update version to 1.3.3
1 parent c735440 commit 2d7ae2c

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

trunk/.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
33
# OpenWrt version: Barrier Breaker (unknown)
4-
# Fri Mar 14 10:59:31 2014
4+
# Sat Jun 28 12:55:11 2014
55
#
66
CONFIG_HAVE_DOT_CONFIG=y
77
# CONFIG_TARGET_ppc40x is not set
@@ -1781,7 +1781,7 @@ CONFIG_PACKAGE_kmod-ipt-ipopt=m
17811781
CONFIG_PACKAGE_kmod-ipt-ipp2p=m
17821782
CONFIG_PACKAGE_kmod-ipt-iprange=m
17831783
CONFIG_PACKAGE_kmod-ipt-ipsec=m
1784-
CONFIG_PACKAGE_kmod-ipt-ipset=m
1784+
# CONFIG_PACKAGE_kmod-ipt-ipset is not set
17851785
CONFIG_PACKAGE_kmod-ipt-ipv4options=m
17861786
CONFIG_PACKAGE_kmod-ipt-led=m
17871787
CONFIG_PACKAGE_kmod-ipt-length2=m

trunk/files/etc/init.d/dragino.init

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ START=99
55
UARTMODE=`uci get iot.general.uartmode`
66

77
start() {
8-
ifconfig eth0 172.31.255.254 netmask 255.255.255.252
8+
ifconfig br-wan:9 172.31.255.254 netmask 255.255.255.252
99
/etc/init.d/avahi-daemon restart
1010
/usr/bin/reset-mcu
1111
load_uart

trunk/package/dragino/luci-app-iot-webpanel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=luci-app-iot-webpanel
1111
PKG_VERSION:=Dragino-Yun-Beta1.3
12-
PKG_RELEASE:=2
12+
PKG_RELEASE:=3
1313

1414

1515
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-linino.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ static struct gpio_keys_button ds_gpio_keys[] __initdata = {
8383

8484
static void __init ds_common_setup(void)
8585
{
86-
static u8 mac[6];
86+
//static u8 mac[6];
8787

8888
u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
8989
ath79_register_m25p80(NULL);
90-
#if 0
90+
#if 1
9191
ath79_register_wmac(art + DS_CALDATA_OFFSET,
9292
art + DS_WMAC_MAC_OFFSET);
9393

0 commit comments

Comments
 (0)