From 75bfc393ba6cffd783e723d3115c25b70836c116 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 9 Aug 2019 17:45:12 +0200 Subject: treewide: convert MAC address location offsets to hexadecimal This changes the offsets for the MAC address location in mtd_get_mac_binary* and mtd_get_mac_text to hexadecimal notation. This will be much clearer for the reader when numbers are big, and will also match the style used for mtd-mac-address in DTS files. (e.g. 0x1006 and 0x5006 are much more useful than 4102 and 20486) Acked-by: Alexander Couzens Signed-off-by: Adrian Schmutzler --- .../base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 10 +++++----- .../etc/hotplug.d/firmware/11-ath10k-caldata | 18 +++++++++--------- .../base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'target/linux/ath79/base-files/etc/hotplug.d') diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index ec597dd1d4..b4c1e1d26d 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -103,7 +103,7 @@ case "$FIRMWARE" in dlink,dir-825-c1|\ dlink,dir-835-a1) ath9k_eeprom_extract "art" 4096 1088 - ath9k_patch_fw_mac_crc $(mtd_get_mac_text "mac" 4) 2 + ath9k_patch_fw_mac_crc $(mtd_get_mac_text "mac" 0x4) 2 ;; dlink,dir-842-c1|\ dlink,dir-842-c2|\ @@ -128,7 +128,7 @@ case "$FIRMWARE" in ;; nec,wg800hp) ath9k_eeprom_extract "art" 4096 1088 - ath9k_patch_fw_mac $(mtd_get_mac_text board_data 1664) 2 + ath9k_patch_fw_mac $(mtd_get_mac_text board_data 0x680) 2 ;; qihoo,c301) ath9k_eeprom_extract "radiocfg" 4096 1088 @@ -156,7 +156,7 @@ case "$FIRMWARE" in dlink,dir-825-c1|\ dlink,dir-835-a1) ath9k_eeprom_extract "art" 20480 1088 - ath9k_patch_fw_mac_crc $(macaddr_add $(mtd_get_mac_text "mac" 24) 1) 2 + ath9k_patch_fw_mac_crc $(macaddr_add $(mtd_get_mac_text "mac" 0x18) 1) 2 ;; ocedo,raccoon|\ tplink,tl-wdr3600-v1|\ @@ -212,7 +212,7 @@ case "$FIRMWARE" in ;; dlink,dir-825-b1) ath9k_eeprom_extract "caldata" 4096 3768 - ath9k_patch_fw_mac_crc $(mtd_get_mac_text "caldata" 65440) 524 + ath9k_patch_fw_mac_crc $(mtd_get_mac_text "caldata" 0xffa0) 524 ;; *) ath9k_eeprom_die "board $board is not supported yet" @@ -229,7 +229,7 @@ case "$FIRMWARE" in ;; dlink,dir-825-b1) ath9k_eeprom_extract "caldata" 20480 3768 - ath9k_patch_fw_mac_crc $(macaddr_add $(mtd_get_mac_text "caldata" 65460) 1) 524 + ath9k_patch_fw_mac_crc $(macaddr_add $(mtd_get_mac_text "caldata" 0xffb4) 1) 524 ;; *) ath9k_eeprom_die "board $board is not supported yet" diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index ebf5d6d390..be2b6f1891 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -99,7 +99,7 @@ case "$FIRMWARE" in devolo,dvl1750i|\ devolo,dvl1750x) ath10kcal_extract "art" 20480 2116 - ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 0) -1) + ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 0x0) -1) ;; dlink,dir-859-a1) ath10kcal_extract "art" 20480 2116 @@ -124,20 +124,20 @@ case "$FIRMWARE" in ;; glinet,gl-ar750s) ath10kcal_extract "art" 20480 2116 - ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0) +1) + ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +1) ;; glinet,gl-x750) ath10kcal_extract "art" 20480 2116 - ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0) +2) + ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +2) ;; nec,wg800hp) ath10kcal_extract "art" 20480 2116 - ath10kcal_patch_mac_crc $(mtd_get_mac_text board_data 2176) + ath10kcal_patch_mac_crc $(mtd_get_mac_text board_data 0x880) ;; ocedo,koala|\ ocedo,ursus) ath10kcal_extract "art" 20480 2116 - ath10kcal_patch_mac $(mtd_get_mac_binary art 12) + ath10kcal_patch_mac $(mtd_get_mac_binary art 0xc) ;; openmesh,om5p-ac-v2) ath10kcal_extract "art" 20480 2116 @@ -153,7 +153,7 @@ case "$FIRMWARE" in tplink,archer-c7-v5|\ tplink,archer-c25-v1) ath10kcal_extract "art" 20480 2116 - ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 8) -1) + ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) -1) ;; tplink,archer-c5-v1|\ tplink,archer-c7-v2) @@ -175,7 +175,7 @@ case "$FIRMWARE" in ;; tplink,re450-v2) ath10kcal_extract "art" 20480 2116 - ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 8) +1) + ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1) ;; ubnt,unifiac-lite|\ ubnt,unifiac-mesh|\ @@ -203,7 +203,7 @@ case "$FIRMWARE" in netgear,ex6400|\ netgear,ex7300) ath10kcal_extract "caldata" 20480 12064 - ath10kcal_patch_mac $(mtd_get_mac_binary caldata 12) + ath10kcal_patch_mac $(mtd_get_mac_binary caldata 0xc) ;; phicomm,k2t) ath10kcal_extract "art" 20480 12064 @@ -217,7 +217,7 @@ case "$FIRMWARE" in tplink,archer-c60-v2|\ tplink,archer-c6-v2) ath10kcal_extract "art" 20480 12064 - ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary mac 8) -1) + ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary mac 0x8) -1) ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ /lib/firmware/ath10k/QCA9888/hw2.0/board.bin ;; 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 d9c3fe7440..3e1cfda84d 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 @@ -40,7 +40,7 @@ case "$board" in mtd_get_mac_text mac 4 > /sys${DEVPATH}/macaddress # set the 5G interface mac address to WAN MAC + 1 [ "$PHYNBR" -eq 0 ] && \ - macaddr_add "$(mtd_get_mac_text mac 24)" 1 > /sys${DEVPATH}/macaddress + macaddr_add "$(mtd_get_mac_text mac 0x18)" 1 > /sys${DEVPATH}/macaddress ;; *) ;; -- cgit v1.2.3