Commit 57dc49a6 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: rename MACvWriteWord to vnt_mac_write_word 



Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36957537

drivers/staging/vt6656/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ void vnt_mac_reg_bits_on(struct vnt_private *priv, u8 reg_ofs, u8 bits) 
		reg_ofs, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);

}



void MACvWriteWord(struct vnt_private *priv, u8 reg_ofs, u16 word)

void vnt_mac_write_word(struct vnt_private *priv, u8 reg_ofs, u16 word)

{

	u8 data[2];

drivers/staging/vt6656/mac.h

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ void vnt_mac_disable_keyentry(struct vnt_private *, u8); 
void vnt_mac_set_keyentry(struct vnt_private *, u16, u32, u32, u8 *, u8 *);

void vnt_mac_reg_bits_off(struct vnt_private *, u8, u8);

void vnt_mac_reg_bits_on(struct vnt_private *, u8, u8);

void MACvWriteWord(struct vnt_private *, u8, u16);

void vnt_mac_write_word(struct vnt_private *, u8, u16);

void MACvWriteBSSIDAddress(struct vnt_private *, u8 *);

void MACvEnableProtectMD(struct vnt_private *);

void MACvDisableProtectMD(struct vnt_private *);

drivers/staging/vt6656/power.c

+2 −2
Original line number Diff line number Diff line
@@ -64,11 +64,11 @@ void PSvEnablePowerSaving(struct vnt_private *pDevice, u16 wListenInterval) 
	u16 wAID = pMgmt->wCurrAID | BIT14 | BIT15;



	/* set period of power up before TBTT */

	MACvWriteWord(pDevice, MAC_REG_PWBT, C_PWBT);

	vnt_mac_write_word(pDevice, MAC_REG_PWBT, C_PWBT);



	if (pDevice->op_mode != NL80211_IFTYPE_ADHOC) {

		/* set AID */

		MACvWriteWord(pDevice, MAC_REG_AIDATIM, wAID);

		vnt_mac_write_word(pDevice, MAC_REG_AIDATIM, wAID);

	}



	/* Warren:06-18-2004,the sequence must follow