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

staging: vt6656: rename MACvEnableBarkerPreambleMd to vnt_mac_enable_barker_preamble_mode 



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

drivers/staging/vt6656/bssdb.c

+1 −1
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ void BSSvSecondCallBack(struct work_struct *work) 


		if (uLongPreambleSTACnt > 0) {

			if (!pDevice->bBarkerPreambleMd) {

				MACvEnableBarkerPreambleMd(pDevice);

				vnt_mac_enable_barker_preamble_mode(pDevice);

				pDevice->bBarkerPreambleMd = true;

			}

		} else if (pDevice->bBarkerPreambleMd) {

drivers/staging/vt6656/mac.c

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

}



void MACvEnableBarkerPreambleMd(struct vnt_private *priv)

void vnt_mac_enable_barker_preamble_mode(struct vnt_private *priv)

{

	u8 data[2];

drivers/staging/vt6656/mac.h

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

void MACvEnableBarkerPreambleMd(struct vnt_private *);

void vnt_mac_enable_barker_preamble_mode(struct vnt_private *);

void MACvDisableBarkerPreambleMd(struct vnt_private *);

void MACvWriteBeaconInterval(struct vnt_private *, u16);

void vnt_mac_set_led(struct vnt_private *priv, u8, u8);

drivers/staging/vt6656/wmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -1668,7 +1668,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) 
                        pDevice->bBarkerPreambleMd = (pBSSList->sERP.byERP & WLAN_EID_ERP_BARKER_MODE);

                        //BarkerPreambleMd has higher priority than shortPreamble bit in Cap

                        if (pDevice->bBarkerPreambleMd) {

                            MACvEnableBarkerPreambleMd(pDevice);

			    vnt_mac_enable_barker_preamble_mode(pDevice);

                        } else {

                            MACvDisableBarkerPreambleMd(pDevice);

                        }
@@ -2400,7 +2400,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus) 
                    pDevice->bBarkerPreambleMd = (pCurr->sERP.byERP & WLAN_EID_ERP_BARKER_MODE);

                    //BarkerPreambleMd has higher priority than shortPreamble bit in Cap

                    if (pDevice->bBarkerPreambleMd) {

                        MACvEnableBarkerPreambleMd(pDevice);

			vnt_mac_enable_barker_preamble_mode(pDevice);

                    } else {

                        MACvDisableBarkerPreambleMd(pDevice);

                    }