[OpenWrt-Devel,1/2] openwrt-19.07: ath79: Code style fixes in 10_fix_wifi_mac
diff mbox series

Message ID 20190622093157.1372-1-freifunk@adrianschmutzler.de
State New
Headers show
Series
  • [OpenWrt-Devel,1/2] openwrt-19.07: ath79: Code style fixes in 10_fix_wifi_mac
Related show

Commit Message

Adrian Schmutzler June 22, 2019, 9:31 a.m. UTC
This fixes one comparison and several useless echos.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 .../base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Jonas Gorski June 22, 2019, 12:14 p.m. UTC | #1
Hi,

On Sat, 22 Jun 2019 at 11:33, Adrian Schmutzler
<freifunk@adrianschmutzler.de> wrote:
> Subject: [PATCH 1/2] openwrt-19.07: ath79: Code style fixes in 10_fix_wifi_mac

the openwrt-19.07 belongs between the [ ], so [PATCH openwrt-19.07 1/2].

>
> This fixes one comparison and several useless echos.
>
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

Are these fixes present in master? If no, then please submit these for
master. If yes, please generate these patches with cherry-pick -x, so
they have a reference to the master commit (makes it easier to see if
these are backports or not).


Regards
Jonas
Adrian Schmutzler June 22, 2019, 1:41 p.m. UTC | #2
Hi,

> -----Original Message-----
> From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org]
> On Behalf Of Jonas Gorski
> Sent: Samstag, 22. Juni 2019 14:14
> To: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> Cc: OpenWrt Development List <openwrt-devel@lists.openwrt.org>
> Subject: Re: [OpenWrt-Devel] [PATCH 1/2] openwrt-19.07: ath79: Code style
> fixes in 10_fix_wifi_mac
> 
> Hi,
> 
> On Sat, 22 Jun 2019 at 11:33, Adrian Schmutzler
> <freifunk@adrianschmutzler.de> wrote:
> > Subject: [PATCH 1/2] openwrt-19.07: ath79: Code style fixes in
> > 10_fix_wifi_mac
> 
> the openwrt-19.07 belongs between the [ ], so [PATCH openwrt-19.07 1/2].

okay, I will do that next time.

> 
> >
> > This fixes one comparison and several useless echos.
> >
> > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> 
> Are these fixes present in master? If no, then please submit these for
> master. If yes, please generate these patches with cherry-pick -x, so they
> have a reference to the master commit (makes it easier to see if these are
> backports or not).

The patch for master is the direct predecessor in patchwork:
https://patchwork.ozlabs.org/patch/1120551/
(Unfortunately the commit title is not exactly the same.)

I like to send master and backport patches (if there are any) in one bunch. If this is discouraged, please tell me.

Note that for ar71xx I only sent a patch for openwrt-19.07 (2/2), since I see no point to still patch in master.
If I'm supposed to patch ar71xx in master first although it is semi-retired, please tell me.

Thanks for your input.

Best

Adrian

> 
> 
> Regards
> Jonas
> 
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Patch
diff mbox series

diff --git a/target/linux/ath79/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ath79/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
index 2da2e8bfb0..bdb8b71ff7 100644
--- a/target/linux/ath79/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+++ b/target/linux/ath79/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
@@ -1,6 +1,6 @@ 
 #!/bin/ash
 
-[ "$ACTION" == "add" ] || exit 0
+[ "$ACTION" = "add" ] || exit 0
 
 PHYNBR=${DEVPATH##*/phy}
 
@@ -17,18 +17,18 @@  case "$board" in
 		# There is no eeprom data for 5 GHz wlan in "art" partition
 		# which would allow to patch the macaddress
 		[ "$PHYNBR" -eq 1 ] && \
-			echo $(macaddr_add "$(mtd_get_mac_ascii u-boot-env ethaddr)" 1) > /sys${DEVPATH}/macaddress
+			macaddr_add "$(mtd_get_mac_ascii u-boot-env ethaddr)" 1 > /sys${DEVPATH}/macaddress
 		;;
 	iodata,wn-ac1600dgr)
 		# There is no eeprom data for 5 GHz wlan in "art" partition
 		# which would allow to patch the macaddress
 		[ "$PHYNBR" -eq 0 ] && \
-			echo $(macaddr_add "$(mtd_get_mac_ascii u-boot-env ethaddr)" 1) > /sys${DEVPATH}/macaddress
+			macaddr_add "$(mtd_get_mac_ascii u-boot-env ethaddr)" 1 > /sys${DEVPATH}/macaddress
 		;;
 	phicomm,k2t)
 		# The K2T factory firmware does use LAN mac address as the 2.4G wifi mac address
 		[ "$PHYNBR" -eq 1 ] && \
-			echo $(k2t_get_mac "lan_mac") > /sys${DEVPATH}/macaddress
+			k2t_get_mac "lan_mac" > /sys${DEVPATH}/macaddress
 		;;
 	*)
 		;;