diff options
| author | Benjamin Romer <benjamin.romer@unisys.com> | 2014-10-27 14:18:12 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-29 17:42:06 +0800 |
| commit | 5689de903e3131b0e501ec9bdb67d1a5bec4392e (patch) | |
| tree | 82a25782ada1cdb047c3d9a1be5f54be28a0abc3 | |
| parent | 086241e6d01e627ad40831b76a1bdb9ec7028a51 (diff) | |
staging: unisys: fix CamelCase in net_adap_info
Fix the CamelCase member name in this structure:
zoneGuid => zone_uuid
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/unisys/virtpci/virtpci.c | 4 | ||||
| -rw-r--r-- | drivers/staging/unisys/virtpci/virtpci.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c index 6fa8caf5381e..1616109408a4 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 8a0d43947596..de2182f37914 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 { |