Commit 83a0ee45 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: rename MACvDisableProtectMD to vnt_mac_disable_protect_mode 



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

drivers/staging/vt6656/bssdb.c

+1 −1
Original line number Diff line number Diff line
@@ -950,7 +950,7 @@ void BSSvSecondCallBack(struct work_struct *work) 
				pDevice->bProtectMode = true;

			}

		} else if (pDevice->bProtectMode) {

			MACvDisableProtectMD(pDevice);

			vnt_mac_disable_protect_mode(pDevice);

			pDevice->bProtectMode = false;

		}

		/* on/off short slot time */

drivers/staging/vt6656/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ void vnt_mac_enable_protect_mode(struct vnt_private *priv) 
		MAC_REG_ENCFG0, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);

}



void MACvDisableProtectMD(struct vnt_private *priv)

void vnt_mac_disable_protect_mode(struct vnt_private *priv)

{

	u8 data[2];

drivers/staging/vt6656/mac.h

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ 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 vnt_mac_enable_protect_mode(struct vnt_private *);

void MACvDisableProtectMD(struct vnt_private *);

void vnt_mac_disable_protect_mode(struct vnt_private *);

void MACvEnableBarkerPreambleMd(struct vnt_private *);

void MACvDisableBarkerPreambleMd(struct vnt_private *);

void MACvWriteBeaconInterval(struct vnt_private *, u16);

drivers/staging/vt6656/wmgr.c

+4 −4
Original line number Diff line number Diff line
@@ -1657,7 +1657,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) 
                        if (pDevice->bProtectMode) {

			    vnt_mac_enable_protect_mode(pDevice);

                        } else {

                            MACvDisableProtectMD(pDevice);

			    vnt_mac_disable_protect_mode(pDevice);

                        }

			vnt_update_ifs(pDevice);

                    }
@@ -2031,7 +2031,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) 


    // Disable Protect Mode

    pDevice->bProtectMode = 0;

    MACvDisableProtectMD(pDevice);

    vnt_mac_disable_protect_mode(pDevice);



    pDevice->bBarkerPreambleMd = 0;

    MACvDisableBarkerPreambleMd(pDevice);
@@ -2389,7 +2389,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) 
                    if (pDevice->bProtectMode) {

			vnt_mac_enable_protect_mode(pDevice);

                    } else {

                        MACvDisableProtectMD(pDevice);

			vnt_mac_disable_protect_mode(pDevice);

                    }

		    vnt_update_ifs(pDevice);

                }
@@ -2565,7 +2565,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, 


    // Init the BSS informations

    pDevice->bProtectMode = false;

    MACvDisableProtectMD(pDevice);

    vnt_mac_disable_protect_mode(pDevice);

    pDevice->bBarkerPreambleMd = false;

    MACvDisableBarkerPreambleMd(pDevice);

    pDevice->bNonERPPresent = false;