2013-06-05 20:41:08

by Malcolm Priestley

[permalink] [raw]
Subject: [PATCH 08/13] staging: vt6656: cleanup MACvWriteBSSIDAddress

Remove secondary buffer

Camel case changes;
pDevice -> priv
pbyEtherAddr -> addr

Functional change
point buffer to callers addr
addr is always ETH_ALEN length and check for NULL
CONTROLnsRequestOut Length = ETH_ALEN

Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/mac.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index 673ed5d..d274cae 100644
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -223,24 +223,16 @@ void MACvWriteWord(struct vnt_private *priv, u16 offset, u16 word)
offset, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
}

-void MACvWriteBSSIDAddress(struct vnt_private *pDevice, u8 *pbyEtherAddr)
+void MACvWriteBSSIDAddress(struct vnt_private *priv, u8 *addr)
{
- u8 pbyData[6];

- pbyData[0] = *((u8 *)pbyEtherAddr);
- pbyData[1] = *((u8 *)pbyEtherAddr+1);
- pbyData[2] = *((u8 *)pbyEtherAddr+2);
- pbyData[3] = *((u8 *)pbyEtherAddr+3);
- pbyData[4] = *((u8 *)pbyEtherAddr+4);
- pbyData[5] = *((u8 *)pbyEtherAddr+5);
+ if (!addr) {
+ pr_warn("%s addr is NULL\n", __func__);
+ return;
+ }

- CONTROLnsRequestOut(pDevice,
- MESSAGE_TYPE_WRITE,
- MAC_REG_BSSID0,
- MESSAGE_REQUEST_MACREG,
- 6,
- pbyData
- );
+ CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE, MAC_REG_BSSID0,
+ MESSAGE_REQUEST_MACREG, ETH_ALEN, addr);
}

void MACvEnableProtectMD(struct vnt_private *pDevice)
--
1.8.1.2