Message ID | trinity-04632559-1da4-4881-a795-800dce917759-1477219376194@3capp-gmx-bs79 |
---|---|
State | Changes Requested |
Headers | show |
On 23/10/2016 12:42, p.wassi@gmx.at wrote: > From: Paul Wassi <p.wassi@gmx.at> > > Remove redundant code: merge boards/cases that share > the same network configuration. > > Signed-off-by: Paul Wassi <p.wassi@gmx.at> patch does not apply to current HEAD. what tree did you base this on ? John > --- > linux/kirkwood/base-files/etc/board.d/02_network | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-) > > diff --git a/target/linux/kirkwood/base-files/etc/board.d/02_network b/target/linux/kirkwood/base-files/etc/board.d/02_network > --- a/target/linux/kirkwood/base-files/etc/board.d/02_network > +++ b/target/linux/kirkwood/base-files/etc/board.d/02_network > @@ -17,13 +17,12 @@ case "$board" in > "iconnect"|\ > "ib62x0"|\ > "nsa310s"|\ > -"pogo_e02") > +"pogo_e02"|\ > +"sheevaplug"|\ > +"sheevaplug-esata") > ucidef_set_interface_lan "eth0" "dhcp" > ;; > -"linksys-audi") > - ucidef_add_switch "switch0" \ > - "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" "6@eth1" > - ;; > +"linksys-audi"|\ > "linksys-viper") > ucidef_add_switch "switch0" \ > "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" "6@eth1" > @@ -31,10 +30,6 @@ case "$board" in > "guruplug-server-plus") > ucidef_set_interface_lan "eth0 eth1" "dhcp" > ;; > -"sheevaplug" | \ > -"sheevaplug-esata") > - ucidef_set_interface_lan "eth0" "dhcp" > - ;; > *) > ucidef_set_interface_lan "eth0" > ;; > > _______________________________________________ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev >
diff --git a/target/linux/kirkwood/base-files/etc/board.d/02_network b/target/linux/kirkwood/base-files/etc/board.d/02_network --- a/target/linux/kirkwood/base-files/etc/board.d/02_network +++ b/target/linux/kirkwood/base-files/etc/board.d/02_network @@ -17,13 +17,12 @@ case "$board" in "iconnect"|\ "ib62x0"|\ "nsa310s"|\ -"pogo_e02") +"pogo_e02"|\ +"sheevaplug"|\ +"sheevaplug-esata") ucidef_set_interface_lan "eth0" "dhcp" ;; -"linksys-audi") - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" "6@eth1" - ;; +"linksys-audi"|\ "linksys-viper") ucidef_add_switch "switch0" \ "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" "6@eth1" @@ -31,10 +30,6 @@ case "$board" in "guruplug-server-plus") ucidef_set_interface_lan "eth0 eth1" "dhcp" ;; -"sheevaplug" | \ -"sheevaplug-esata") - ucidef_set_interface_lan "eth0" "dhcp" - ;; *) ucidef_set_interface_lan "eth0" ;;