diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-07-19 12:30:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 12:11:57 -0700 |
| commit | 41e8321a6d3b775a05e94fecd4ea5b4711e12729 (patch) | |
| tree | 2da31235ff5cbdbaef30f2ee68fa5fed880761f4 /drivers/staging/vt6656 | |
| parent | ebf9b312389a01763ae7388ff3e8f37e82261a92 (diff) | |
| download | op-kernel-dev-41e8321a6d3b775a05e94fecd4ea5b4711e12729.zip op-kernel-dev-41e8321a6d3b775a05e94fecd4ea5b4711e12729.tar.gz | |
staging: vt6656: rename abyPermanentNetAddr to permanent_net_addr
Removing prefix and camel case
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656')
| -rw-r--r-- | drivers/staging/vt6656/device.h | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/main_usb.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 9287948..0c18e26 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -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; diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index e8e4de5..0bf207c 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -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); |
