staging: unisys: fix CamelCase in net_adap_info
authorBenjamin Romer <benjamin.romer@unisys.com>
Mon, 27 Oct 2014 18:18:12 +0000 (14:18 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2014 09:42:06 +0000 (17:42 +0800)
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>
drivers/staging/unisys/virtpci/virtpci.c
drivers/staging/unisys/virtpci/virtpci.h

index 6fa8caf5381e79fd9e95d3c341ab9994e3e1bce4..1616109408a4271af467f33861e85c7608d81eb5 100644 (file)
@@ -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",
index 8a0d43947596d9cad6c0da7a6af985df6b4a0134..de2182f379143e6ad63673f62af27addf12d9472 100644 (file)
@@ -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 {