Commit ccbf4415 authored May 31, 2014 by Malcolm Priestley Committed by Greg Kroah-Hartman Jun 19, 2014

staging: vt6656: rename MACvEnableProtectMD to vnt_mac_enable_protect_mode



Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1cd34eaa

drivers/staging/vt6656/bssdb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -946,7 +946,7 @@ void BSSvSecondCallBack(struct work_struct *work)
		/* on/off protect mode */
		if (WLAN_GET_ERP_USE_PROTECTION(pDevice->byERPFlag)) {
		if (!pDevice->bProtectMode) {
		MACvEnableProtectMD(pDevice);
		vnt_mac_enable_protect_mode(pDevice);
		pDevice->bProtectMode = true;
		}
		} else if (pDevice->bProtectMode) {

drivers/staging/vt6656/mac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -186,7 +186,7 @@ void vnt_mac_set_bssid_addr(struct vnt_private priv, u8 addr)
		MESSAGE_REQUEST_MACREG, ETH_ALEN, addr);
		}

		void MACvEnableProtectMD(struct vnt_private *priv)
		void vnt_mac_enable_protect_mode(struct vnt_private *priv)
		{
		u8 data[2];

drivers/staging/vt6656/mac.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -423,7 +423,7 @@ void vnt_mac_reg_bits_off(struct vnt_private *, u8, u8);
		void vnt_mac_reg_bits_on(struct vnt_private *, u8, u8);
		void vnt_mac_write_word(struct vnt_private *, u8, u16);
		void vnt_mac_set_bssid_addr(struct vnt_private , u8 );
		void MACvEnableProtectMD(struct vnt_private *);
		void vnt_mac_enable_protect_mode(struct vnt_private *);
		void MACvDisableProtectMD(struct vnt_private *);
		void MACvEnableBarkerPreambleMd(struct vnt_private *);
		void MACvDisableBarkerPreambleMd(struct vnt_private *);

drivers/staging/vt6656/wmgr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1655,7 +1655,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
		if ((pBSSList->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION) != pDevice->bProtectMode) {//0000 0010
		pDevice->bProtectMode = (pBSSList->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION);
		if (pDevice->bProtectMode) {
		MACvEnableProtectMD(pDevice);
		vnt_mac_enable_protect_mode(pDevice);
		} else {
		MACvDisableProtectMD(pDevice);
		}
		@@ -2387,7 +2387,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus)
		if ((pCurr->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION) != pDevice->bProtectMode) {//0000 0010
		pDevice->bProtectMode = (pCurr->sERP.byERP & WLAN_EID_ERP_USE_PROTECTION);
		if (pDevice->bProtectMode) {
		MACvEnableProtectMD(pDevice);
		vnt_mac_enable_protect_mode(pDevice);
		} else {
		MACvDisableProtectMD(pDevice);
		}