Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: vt6656: Replace typedef enum _CARD_OP_MODE 



Replace typedef enum _CARD_OP_MODE eOPMode with op_mode enum nl80211_iftype

enum changes
OP_MODE_INFRASTRUCTURE -> NL80211_IFTYPE_STATION
OP_MODE_AP -> NL80211_IFTYPE_AP
OP_MODE_DEF -> NL80211_IFTYPE_UNSPECIFIED
OP_MODE_ADHOC -> NL80211_IFTYPE_ADHOC

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

drivers/staging/vt6656/card.h

+0 −7
Original line number Diff line number Diff line
@@ -39,13 +39,6 @@ typedef enum _CARD_PHY_TYPE { 
    PHY_TYPE_11A

} CARD_PHY_TYPE, *PCARD_PHY_TYPE;



typedef enum _CARD_OP_MODE {

    OP_MODE_INFRASTRUCTURE = 0,

    OP_MODE_ADHOC,

    OP_MODE_AP,

    OP_MODE_UNKNOWN

} CARD_OP_MODE, *PCARD_OP_MODE;



#define CB_MAX_CHANNEL_24G  14

#define CB_MAX_CHANNEL_5G       42 /* add channel9(5045MHz), 41==>42 */

#define CB_MAX_CHANNEL      (CB_MAX_CHANNEL_24G+CB_MAX_CHANNEL_5G)

drivers/staging/vt6656/device.h

+3 −1
Original line number Diff line number Diff line
@@ -588,7 +588,9 @@ struct vnt_private { 
	u16 wFragmentationThreshold;

	u8 byShortRetryLimit;

	u8 byLongRetryLimit;

	CARD_OP_MODE eOPMode;



	enum nl80211_iftype op_mode;



	int bBSSIDFilter;

	u16 wMaxTransmitMSDULifetime;

	u8 abyBSSID[ETH_ALEN];

drivers/staging/vt6656/dpc.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, struct vnt_rcb *pRCB, 


    // Now it only supports 802.11g Infrastructure Mode, and support rate must up to 54 Mbps

    if (pDevice->bDiversityEnable && (FrameSize>50) &&

       (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) &&

	pDevice->op_mode == NL80211_IFTYPE_STATION &&

       (pDevice->bLinkPass == true)) {

        BBvAntennaDiversity(pDevice, s_byGetRateIdx(*pbyRxRate), 0);

    }

drivers/staging/vt6656/int.c

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ void INTnsProcessData(struct vnt_private *pDevice) 
	}

	if (pINTData->byISR0 != 0) {

		if (pINTData->byISR0 & ISR_BNTX) {

			if (pDevice->eOPMode == OP_MODE_AP) {

			if (pDevice->op_mode == NL80211_IFTYPE_AP) {

				if (pMgmt->byDTIMCount > 0) {

					pMgmt->byDTIMCount--;

					pMgmt->sNodeDBTable[0].bRxPSPoll =
@@ -149,7 +149,7 @@ void INTnsProcessData(struct vnt_private *pDevice) 
				bScheduleCommand((void *) pDevice,

						WLAN_CMD_BECON_SEND,

						NULL);

			} /* if (pDevice->eOPMode == OP_MODE_AP) */

			}

		pDevice->bBeaconSent = true;

		} else {

			pDevice->bBeaconSent = false;

drivers/staging/vt6656/iwctl.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev) 
	struct vnt_private *pDevice = netdev_priv(dev);

	long ldBm;



	pDevice->wstats.status = pDevice->eOPMode;

	pDevice->wstats.status = pDevice->op_mode;

	RFvRSSITodBm(pDevice, (u8)(pDevice->uCurrRSSI), &ldBm);

	pDevice->wstats.qual.level = ldBm;

	pDevice->wstats.qual.noise = 0;