diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c index 6fa8caf5381e79fd9e95d3c341ab9994e3e1bce4..1616109408a4271af467f33861e85c7608d81eb5 100644 --- a/drivers/staging/unisys/virtpci/virtpci.c +++ b/drivers/staging/unisys/virtpci/virtpci.c @@ -363,7 +363,7 @@ static int add_vhba(struct add_virt_guestpart *addparams) chanptr)->vnic.num_rcv_bufs); \ net.mtu = readl(&((struct spar_io_channel_protocol __iomem *) \ chanptr)->vnic.mtu); \ - memcpy_fromio(&net.zoneGuid, \ + memcpy_fromio(&net.zone_uuid, \ &((struct spar_io_channel_protocol __iomem *)\ chanptr)->vnic.zone_uuid, \ sizeof(uuid_le)); \ @@ -395,7 +395,7 @@ add_vnic(struct add_virt_guestpart *addparams) LOGINF("Adding vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x rcvbufs:%d mtu:%d chanptr:%p%pUL\n", net.mac_addr[0], net.mac_addr[1], net.mac_addr[2], net.mac_addr[3], net.mac_addr[4], net.mac_addr[5], net.num_rcv_bufs, net.mtu, - addparams->chanptr, &net.zoneGuid); + addparams->chanptr, &net.zone_uuid); i = virtpci_device_add(vbus, VIRTNIC_TYPE, addparams, NULL, &net); if (i) { LOGINF("Added vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n", diff --git a/drivers/staging/unisys/virtpci/virtpci.h b/drivers/staging/unisys/virtpci/virtpci.h index 8a0d43947596d9cad6c0da7a6af985df6b4a0134..de2182f379143e6ad63673f62af27addf12d9472 100644 --- a/drivers/staging/unisys/virtpci/virtpci.h +++ b/drivers/staging/unisys/virtpci/virtpci.h @@ -42,7 +42,7 @@ struct net_adap_info { u8 mac_addr[MAX_MACADDR_LEN]; int num_rcv_bufs; unsigned mtu; - uuid_le zoneGuid; + uuid_le zone_uuid; }; typedef enum {