redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: vt6656: remame abyCurrentNetAddr to current_net_addr

Browse source 
Removing prefix and camel case

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-07-19 12:30:10 +01:00 committed by Greg Kroah-Hartman
parent 09440e5464
commit ebf9b31238
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/vt6656/device.h
View file

@ -306,7 +306,7 @@ struct vnt_private {
struct vnt_cmd_card_init init_command;
struct vnt_rsp_card_init init_response;
u8 abyCurrentNetAddr[ETH_ALEN];
u8 current_net_addr[ETH_ALEN];
u8 abyPermanentNetAddr[ETH_ALEN];
int bExistSWNetAddr;

6
drivers/staging/vt6656/main_usb.c
View file

@ -165,7 +165,7 @@ static int device_init_registers(struct vnt_private *priv)
init_cmd->init_class = DEVICE_INIT_COLD;
init_cmd->exist_sw_net_addr = (u8) priv->bExistSWNetAddr;
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->long_retry_limit = priv->byLongRetryLimit;
@ -335,12 +335,12 @@ static int device_init_registers(struct vnt_private *priv)
/* get permanent network address */
memcpy(priv->abyPermanentNetAddr, init_rsp->net_addr, 6);
memcpy(priv->abyCurrentNetAddr,
memcpy(priv->current_net_addr,
priv->abyPermanentNetAddr, ETH_ALEN);
/* if exist SW network address, use it */
dev_dbg(&priv->usb->dev, "Network address = %pM\n",
priv->abyCurrentNetAddr);
priv->current_net_addr);
/*
* set BB and packet type at the same time

4
drivers/staging/vt6656/rxtx.c
View file

@ -517,7 +517,7 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context,
buf->data.frame_control =
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,
current_rate, &buf->data_head, frame_len,
@ -536,7 +536,7 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context,
buf->data.frame_control =
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,
&buf->data_head, frame_len, need_ack);