Commit 41e8321a authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: rename abyPermanentNetAddr to permanent_net_addr

Removing prefix and camel case
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ebf9b312
...@@ -307,7 +307,7 @@ struct vnt_private { ...@@ -307,7 +307,7 @@ struct vnt_private {
struct vnt_cmd_card_init init_command; struct vnt_cmd_card_init init_command;
struct vnt_rsp_card_init init_response; struct vnt_rsp_card_init init_response;
u8 current_net_addr[ETH_ALEN]; u8 current_net_addr[ETH_ALEN];
u8 abyPermanentNetAddr[ETH_ALEN]; u8 permanent_net_addr[ETH_ALEN];
int bExistSWNetAddr; int bExistSWNetAddr;
......
...@@ -334,9 +334,8 @@ static int device_init_registers(struct vnt_private *priv) ...@@ -334,9 +334,8 @@ static int device_init_registers(struct vnt_private *priv)
} }
/* get permanent network address */ /* get permanent network address */
memcpy(priv->abyPermanentNetAddr, init_rsp->net_addr, 6); memcpy(priv->permanent_net_addr, init_rsp->net_addr, 6);
memcpy(priv->current_net_addr, memcpy(priv->current_net_addr, priv->permanent_net_addr, ETH_ALEN);
priv->abyPermanentNetAddr, ETH_ALEN);
/* if exist SW network address, use it */ /* if exist SW network address, use it */
dev_dbg(&priv->usb->dev, "Network address = %pM\n", dev_dbg(&priv->usb->dev, "Network address = %pM\n",
...@@ -970,7 +969,7 @@ int vnt_init(struct vnt_private *priv) ...@@ -970,7 +969,7 @@ int vnt_init(struct vnt_private *priv)
if (!(device_init_registers(priv))) if (!(device_init_registers(priv)))
return -EAGAIN; return -EAGAIN;
SET_IEEE80211_PERM_ADDR(priv->hw, priv->abyPermanentNetAddr); SET_IEEE80211_PERM_ADDR(priv->hw, priv->permanent_net_addr);
vnt_init_bands(priv); vnt_init_bands(priv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment