| Message ID | 1509751289-2721-1-git-send-email-freifunk@adrianschmutzler.de |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 index 28e08a1..2079fd5 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 @@ -13,6 +13,5 @@ BATMAN_PORTS="3 4 0t" # Load second MAC from Flash because we haven't any Interface with this MAC where we can copy the MAC from # https://github.com/lede-project/source/pull/613/files#diff-abd6f42f54204372151e73eac0556db1 -NEWMAC=$(macaddr_add $(mtd_get_mac_binary product-info 8) 1) -ETHMESHMAC=1 -ROUTERMAC=eth0 +ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary product-info 8) 1) +ROUTERMAC=$(cat /sys/class/net/eth0/address) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 index 4d22fde..4405406 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 @@ -6,5 +6,5 @@ CLIENT_PORTS="1 2 0t" WAN_PORTS= BATMAN_PORTS="3 4 0t" -ETHMESHMAC=eth1 -ROUTERMAC=eth0 +ETHMESHMAC=$(cat /sys/class/net/eth1/address) +ROUTERMAC=$(cat /sys/class/net/eth0/address)
Hi Am Samstag, den 04.11.2017, 00:21 +0100 schrieb Adrian Schmutzler: > Some MAC adresses were forgotten/not updated in a previous > patch. This is fixed now. Arg.. Mist.. ;) Reviewed-by: Tim Niemeyer <tim@tn-x.org> Tim > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 | 5 ++--- > src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 | 4 ++-- > 2 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n- > v5 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 > index 28e08a1..2079fd5 100644 > --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 > +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 > @@ -13,6 +13,5 @@ BATMAN_PORTS="3 4 0t" > # Load second MAC from Flash because we haven't any Interface with > this MAC where we can copy the MAC from > # https://github.com/lede-project/source/pull/613/files#diff-abd6f42 > f54204372151e73eac0556db1 > > -NEWMAC=$(macaddr_add $(mtd_get_mac_binary product-info 8) 1) > -ETHMESHMAC=1 > -ROUTERMAC=eth0 > +ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary product-info 8) 1) > +ROUTERMAC=$(cat /sys/class/net/eth0/address) > diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 > b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 > index 4d22fde..4405406 100644 > --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 > +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 > @@ -6,5 +6,5 @@ CLIENT_PORTS="1 2 0t" > WAN_PORTS= > BATMAN_PORTS="3 4 0t" > > -ETHMESHMAC=eth1 > -ROUTERMAC=eth0 > +ETHMESHMAC=$(cat /sys/class/net/eth1/address) > +ROUTERMAC=$(cat /sys/class/net/eth0/address) > -- > 2.7.4 >
Wo sind die denn her gekommen? :D Vor allem der 841v12 wunder mich, der ist doch nicht neu? Wie auch immer. Reviewed-by: Fabian Bläse <fabian@blaese.de> Fabian > On 4. Nov 2017, at 00:26, Tim Niemeyer <tim@tn-x.org> wrote: > > Hi > > Am Samstag, den 04.11.2017, 00:21 +0100 schrieb Adrian Schmutzler: >> Some MAC adresses were forgotten/not updated in a previous >> patch. This is fixed now. > Arg.. Mist.. ;) > > Reviewed-by: Tim Niemeyer <tim@tn-x.org> > > Tim > >> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> >> --- >> src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 | 5 ++--- >> src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 | 4 ++-- >> 2 files changed, 4 insertions(+), 5 deletions(-) >> >> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n- >> v5 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 >> index 28e08a1..2079fd5 100644 >> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 >> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 >> @@ -13,6 +13,5 @@ BATMAN_PORTS="3 4 0t" >> # Load second MAC from Flash because we haven't any Interface with >> this MAC where we can copy the MAC from >> # https://github.com/lede-project/source/pull/613/files#diff-abd6f42 >> f54204372151e73eac0556db1 >> >> -NEWMAC=$(macaddr_add $(mtd_get_mac_binary product-info 8) 1) >> -ETHMESHMAC=1 >> -ROUTERMAC=eth0 >> +ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary product-info 8) 1) >> +ROUTERMAC=$(cat /sys/class/net/eth0/address) >> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 >> b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 >> index 4d22fde..4405406 100644 >> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 >> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 >> @@ -6,5 +6,5 @@ CLIENT_PORTS="1 2 0t" >> WAN_PORTS= >> BATMAN_PORTS="3 4 0t" >> >> -ETHMESHMAC=eth1 >> -ROUTERMAC=eth0 >> +ETHMESHMAC=$(cat /sys/class/net/eth1/address) >> +ROUTERMAC=$(cat /sys/class/net/eth0/address) >> -- >> 2.7.4 > -- > franken-dev mailing list > franken-dev@freifunk.net > http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Am Samstag, den 04.11.2017, 08:40 +0100 schrieb Fabian Bläse:
> Wo sind die denn her gekommen? :D
In den Patches davor. ;)
Und Applied.
Tim
Some MAC adresses were forgotten/not updated in a previous patch. This is fixed now. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 | 5 ++--- src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-)