]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging: vt6656: rename abyPermanentNetAddr to permanent_net_addr
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 19 Jul 2014 11:30:11 +0000 (12:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Jul 2014 19:11:57 +0000 (12:11 -0700)
Removing prefix and camel case

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/device.h
drivers/staging/vt6656/main_usb.c

index 928794861d3937a27ed214e52f86000fc5e33b62..0c18e26a38e67d9d8251e3d94bb163c999b1424e 100644 (file)
@@ -307,7 +307,7 @@ struct vnt_private {
        struct vnt_cmd_card_init init_command;
        struct vnt_rsp_card_init init_response;
        u8 current_net_addr[ETH_ALEN];
-       u8 abyPermanentNetAddr[ETH_ALEN];
+       u8 permanent_net_addr[ETH_ALEN];
 
        int bExistSWNetAddr;
 
index e8e4de5b18ac799c9e6e4ed35b5a207a239f51f5..0bf207cac0506aadb2354bcec0350e449277ae56 100644 (file)
@@ -334,9 +334,8 @@ static int device_init_registers(struct vnt_private *priv)
        }
 
        /* get permanent network address */
-       memcpy(priv->abyPermanentNetAddr, init_rsp->net_addr, 6);
-       memcpy(priv->current_net_addr,
-                               priv->abyPermanentNetAddr, ETH_ALEN);
+       memcpy(priv->permanent_net_addr, init_rsp->net_addr, 6);
+       memcpy(priv->current_net_addr, priv->permanent_net_addr, ETH_ALEN);
 
        /* if exist SW network address, use it */
        dev_dbg(&priv->usb->dev, "Network address = %pM\n",
@@ -970,7 +969,7 @@ int vnt_init(struct vnt_private *priv)
        if (!(device_init_registers(priv)))
                return -EAGAIN;
 
-       SET_IEEE80211_PERM_ADDR(priv->hw, priv->abyPermanentNetAddr);
+       SET_IEEE80211_PERM_ADDR(priv->hw, priv->permanent_net_addr);
 
        vnt_init_bands(priv);