Skip to contentSkip to conversation

bootwrapper: Factor out dt_set_mac_address().

PATCH In review Scott Wood 2 participants 3 messages Sep 24, 2007 – Sep 25, 2007 PowerPC

lore
Share & tools
lore

Scott Wood

author
#0 lore raw

PATCH 15/40 bootwrapper: Factor out dt_set_mac_address().

This allows callers to set addresses one at a time when that would be more convenient.

Signed-off-by Scott Wood <[email protected]>

---
Resent, with dt_set_mac_address -> dt-fixup_mac_address.

 arch/powerpc/boot/devtree.c |   31 +++++++++++++++++--------------
 arch/powerpc/boot/ops.h     |    1 +
 2 files changed, 18 insertions(+), 14 deletions(-)
arch/powerpc/boot/devtree.c +17 -14
index 549463b..e5dfe44 100644
@@ -88,29 +88,32 @@ void dt_fixup_clock(const char *path, u32 freq)
 	}
 }
 
+void dt_fixup_mac_address(u32 index, const u8 *addr)
+{
+	void *devp = find_node_by_prop_value(NULL, "linux,network-index",
+	                                     (void*)&index, sizeof(index));
+
+	if (devp) {
+		printf("ENET%d: local-mac-address <-"
+		       " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index,
+		       addr[0], addr[1], addr[2],
+		       addr[3], addr[4], addr[5]);
+
+		setprop(devp, "local-mac-address", addr, 6);
+	}
+}
+
 void __dt_fixup_mac_addresses(u32 startindex, ...)
 {
 	va_list ap;
 	u32 index = startindex;
-	void *devp;
 	const u8 *addr;
 
 	va_start(ap, startindex);
-	while ((addr = va_arg(ap, const u8 *))) {
-		devp = find_node_by_prop_value(NULL, "linux,network-index",
-					       (void*)&index, sizeof(index));
 
-		if (devp) {
-			printf("ENET%d: local-mac-address <-"
-			       " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index,
-			       addr[0], addr[1], addr[2],
-			       addr[3], addr[4], addr[5]);
+	while ((addr = va_arg(ap, const u8 *)))
+		dt_fixup_mac_address(index++, addr);
 
-			setprop(devp, "local-mac-address", addr, 6);
-		}
-
-		index++;
-	}
 	va_end(ap);
 }
arch/powerpc/boot/ops.h +1 -0
index 703255b..5b77fe3 100644
@@ -160,6 +160,7 @@ static inline void *find_node_by_devtype(const void *prev,
 void dt_fixup_memory(u64 start, u64 size);
 void dt_fixup_cpu_clocks(u32 cpufreq, u32 tbfreq, u32 busfreq);
 void dt_fixup_clock(const char *path, u32 freq);
+void dt_fixup_mac_address(u32 index, const u8 *addr);
 void __dt_fixup_mac_addresses(u32 startindex, ...);
 #define dt_fixup_mac_addresses(...) \
 	__dt_fixup_mac_addresses(0, __VA_ARGS__, NULL)
Signature · 1 line
1.5.3.1
author
#1 lore raw
Quoted 1 line · Scott Wood

[PATCH 15/40]

Bah, that was supposed to be 1/2. Don't worry, there's no barrage of patches coming. :-)

-Scott

Acked-by on v1 15/40
#2 lore raw
In reply to Scott Wood
Quoted 4 lines · Scott Wood

This allows callers to set addresses one at a time when that would be more convenient.

Signed-off-by Scott Wood <[email protected]>

Sorry I've been such a pain about this previously.

Acked-by David Gibson <[email protected]>
Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson