network: also shorten virtual interface names of ppp and 3g/4g connections

Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45479 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Steven Barth 2015-04-17 14:47:12 +00:00
parent 70a75d6f0c
commit 0699cfb2e5
5 changed files with 9 additions and 9 deletions

View File

@ -22,7 +22,7 @@ proto_send_update "$PPP_IPPARAM"
if [ -n "$AUTOIPV6" ]; then if [ -n "$AUTOIPV6" ]; then
json_init json_init
json_add_string name "${PPP_IPPARAM}_dhcpv6" json_add_string name "${PPP_IPPARAM}_6"
json_add_string ifname "@$PPP_IPPARAM" json_add_string ifname "@$PPP_IPPARAM"
json_add_string proto "dhcpv6" json_add_string proto "dhcpv6"
json_close_object json_close_object

View File

@ -77,13 +77,13 @@ proto_directip_setup() {
proto_send_update "$interface" proto_send_update "$interface"
json_init json_init
json_add_string name "${interface}_dhcp" json_add_string name "${interface}_4"
json_add_string ifname "@$interface" json_add_string ifname "@$interface"
json_add_string proto "dhcp" json_add_string proto "dhcp"
ubus call network add_dynamic "$(json_dump)" ubus call network add_dynamic "$(json_dump)"
json_init json_init
json_add_string name "${interface}_dhcpv6" json_add_string name "${interface}_6"
json_add_string ifname "@$interface" json_add_string ifname "@$interface"
json_add_string proto "dhcpv6" json_add_string proto "dhcpv6"
ubus call network add_dynamic "$(json_dump)" ubus call network add_dynamic "$(json_dump)"

View File

@ -120,13 +120,13 @@ proto_ncm_setup() {
proto_send_update "$interface" proto_send_update "$interface"
json_init json_init
json_add_string name "${interface}_dhcp" json_add_string name "${interface}_4"
json_add_string ifname "@$interface" json_add_string ifname "@$interface"
json_add_string proto "dhcp" json_add_string proto "dhcp"
ubus call network add_dynamic "$(json_dump)" ubus call network add_dynamic "$(json_dump)"
json_init json_init
json_add_string name "${interface}_dhcpv6" json_add_string name "${interface}_6"
json_add_string ifname "@$interface" json_add_string ifname "@$interface"
json_add_string proto "dhcpv6" json_add_string proto "dhcpv6"
ubus call network add_dynamic "$(json_dump)" ubus call network add_dynamic "$(json_dump)"

View File

@ -127,14 +127,14 @@ proto_mbim_setup() {
proto_send_update "$interface" proto_send_update "$interface"
json_init json_init
json_add_string name "${interface}_dhcp" json_add_string name "${interface}_4"
json_add_string ifname "@$interface" json_add_string ifname "@$interface"
json_add_string proto "dhcp" json_add_string proto "dhcp"
json_close_object json_close_object
ubus call network add_dynamic "$(json_dump)" ubus call network add_dynamic "$(json_dump)"
json_init json_init
json_add_string name "${interface}_dhcpv6" json_add_string name "${interface}_6"
json_add_string ifname "@$interface" json_add_string ifname "@$interface"
json_add_string proto "dhcpv6" json_add_string proto "dhcpv6"
ubus call network add_dynamic "$(json_dump)" ubus call network add_dynamic "$(json_dump)"

View File

@ -118,14 +118,14 @@ proto_qmi_setup() {
proto_send_update "$interface" proto_send_update "$interface"
json_init json_init
json_add_string name "${interface}_dhcp" json_add_string name "${interface}_4"
json_add_string ifname "@$interface" json_add_string ifname "@$interface"
json_add_string proto "dhcp" json_add_string proto "dhcp"
json_close_object json_close_object
ubus call network add_dynamic "$(json_dump)" ubus call network add_dynamic "$(json_dump)"
json_init json_init
json_add_string name "${interface}_dhcpv6" json_add_string name "${interface}_6"
json_add_string ifname "@$interface" json_add_string ifname "@$interface"
json_add_string proto "dhcpv6" json_add_string proto "dhcpv6"
json_close_object json_close_object