Handle MAC address for VETH

VETH have 8-byte MAC address.

Signed-off-by: Dinar Valeev <dvaleev@suse.com>

Author: Dinar Valeev

include/file.h

@@ -90,7 +90,7 @@ struct path_description {
 			char *ip_before_filename;
 #define path_net_after(x) (x)->u.n.ip_after_filename
 			char *ip_after_filename;
-			unsigned char mac[6];
+			unsigned char mac[8];
 		} n;
 		struct {
 			char *s1;

second/parse_device_path.c

@@ -612,11 +612,21 @@ static void parse_net_device(struct path_description *path, const char *netdev_o
 static void get_mac_address(struct path_description *result)
 {
 	phandle dev = prom_finddevice(path_device(result));
+
+	int len;
+	unsigned char* m;
+
 	if (dev != PROM_INVALID_HANDLE) {
-		if (prom_getprop(dev, "mac-address", &result->u.n.mac, 6) == -1)
-			prom_getprop(dev, "local-mac-address", &result->u.n.mac, 6);
-		prom_printf("MAC for %s: %02x:%02x:%02x:%02x:%02x:%02x\n", path_device(result),
-			    result->u.n.mac[0], result->u.n.mac[1], result->u.n.mac[2], result->u.n.mac[3], result->u.n.mac[4], result->u.n.mac[5]);
+		len = prom_getproplen(dev, "mac-address");
+		if (prom_getprop(dev, "mac-address", &result->u.n.mac, len) < 0) {
+			len = prom_getproplen(dev, "local-mac-address");
+			prom_getprop(dev, "local-mac-address", &result->u.n.mac, len);
+			m = result->u.n.mac;
+			if (len == 8)
+				m = m + 2;
+			 prom_printf("MAC for %s: %02x:%02x:%02x:%02x:%02x:%02x\n", path_device(result),
+				     m[0], m[1], m[2], m[3], m[4], m[5]);
+		}
 	}
 }
 

second/yaboot.c

@@ -208,14 +208,18 @@ static int find_and_load_config_file(const struct path_description *b, char *con
 	int sz = 0, opened = 0, result;
 	int i;
 	struct path_description config_fspec;
-
+	unsigned char* m;
 	switch (path_type(b)) {
 	case TYPE_NET:
 		names = config_file_names_net;
+		m = b->u.n.mac;
+		if ( m[7] != NULL )
+			m = m + 2;
+
 		for (i = 0; i < 6; i++)
-			if (b->u.n.mac[i]) {
+			if (m[i]) {
 				sprintf(config_file_name_ether_mac, config_file_name_ether_mac_template,
-					b->u.n.mac[0], b->u.n.mac[1], b->u.n.mac[2], b->u.n.mac[3], b->u.n.mac[4], b->u.n.mac[5]);
+					m[0], m[1], m[2], m[3], m[4], m[5]);
 				break;
 			}
 		break;