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

staging: vt6656: remame abyCurrentNetAddr to current_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 09440e54
...@@ -306,7 +306,7 @@ struct vnt_private { ...@@ -306,7 +306,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 abyCurrentNetAddr[ETH_ALEN]; u8 current_net_addr[ETH_ALEN];
u8 abyPermanentNetAddr[ETH_ALEN]; u8 abyPermanentNetAddr[ETH_ALEN];
int bExistSWNetAddr; int bExistSWNetAddr;
......
...@@ -165,7 +165,7 @@ static int device_init_registers(struct vnt_private *priv) ...@@ -165,7 +165,7 @@ static int device_init_registers(struct vnt_private *priv)
init_cmd->init_class = DEVICE_INIT_COLD; init_cmd->init_class = DEVICE_INIT_COLD;
init_cmd->exist_sw_net_addr = (u8) priv->bExistSWNetAddr; init_cmd->exist_sw_net_addr = (u8) priv->bExistSWNetAddr;
for (ii = 0; ii < 6; ii++) for (ii = 0; ii < 6; ii++)
init_cmd->sw_net_addr[ii] = priv->abyCurrentNetAddr[ii]; init_cmd->sw_net_addr[ii] = priv->current_net_addr[ii];
init_cmd->short_retry_limit = priv->byShortRetryLimit; init_cmd->short_retry_limit = priv->byShortRetryLimit;
init_cmd->long_retry_limit = priv->byLongRetryLimit; init_cmd->long_retry_limit = priv->byLongRetryLimit;
...@@ -335,12 +335,12 @@ static int device_init_registers(struct vnt_private *priv) ...@@ -335,12 +335,12 @@ 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->abyPermanentNetAddr, init_rsp->net_addr, 6);
memcpy(priv->abyCurrentNetAddr, memcpy(priv->current_net_addr,
priv->abyPermanentNetAddr, 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",
priv->abyCurrentNetAddr); priv->current_net_addr);
/* /*
* set BB and packet type at the same time * set BB and packet type at the same time
......
...@@ -517,7 +517,7 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, ...@@ -517,7 +517,7 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context,
buf->data.frame_control = buf->data.frame_control =
cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS); cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);
memcpy(buf->data.ra, priv->abyCurrentNetAddr, ETH_ALEN); memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN);
return vnt_rxtx_datahead_g_fb(tx_context, pkt_type, return vnt_rxtx_datahead_g_fb(tx_context, pkt_type,
current_rate, &buf->data_head, frame_len, current_rate, &buf->data_head, frame_len,
...@@ -536,7 +536,7 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, ...@@ -536,7 +536,7 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context,
buf->data.frame_control = buf->data.frame_control =
cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS); cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);
memcpy(buf->data.ra, priv->abyCurrentNetAddr, ETH_ALEN); memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN);
return vnt_rxtx_datahead_g(tx_context, pkt_type, current_rate, return vnt_rxtx_datahead_g(tx_context, pkt_type, current_rate,
&buf->data_head, frame_len, need_ack); &buf->data_head, frame_len, need_ack);
......
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