staging: vt6655: Fix line over 80 characters. (0a7ba623) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/staging/vt6655/80211mgr.c

+205 −126

Original line number	Original line	Diff line number	Diff line
	@@ -91,12 +91,15 @@ vMgrEncodeBeacon(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pqwTimestamp = (PQWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pqwTimestamp = (PQWORD)
	+ WLAN_BEACON_OFF_TS);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwBeaconInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_BEACON_OFF_TS);
	+ WLAN_BEACON_OFF_BCN_INT);		pFrame->pwBeaconInterval = (unsigned short *)
	pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	+ WLAN_BEACON_OFF_CAPINFO);		WLAN_BEACON_OFF_BCN_INT);
			pFrame->pwCapInfo = (unsigned short *)
			(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_BEACON_OFF_CAPINFO);

	pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_BEACON_OFF_SSID;		pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_BEACON_OFF_SSID;

	@@ -124,16 +127,20 @@ vMgrDecodeBeacon(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pqwTimestamp = (PQWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pqwTimestamp = (PQWORD)
	+ WLAN_BEACON_OFF_TS);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwBeaconInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_BEACON_OFF_TS);
	+ WLAN_BEACON_OFF_BCN_INT);		pFrame->pwBeaconInterval = (unsigned short *)
	pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	+ WLAN_BEACON_OFF_CAPINFO);		WLAN_BEACON_OFF_BCN_INT);
			pFrame->pwCapInfo = (unsigned short *)
			(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_BEACON_OFF_CAPINFO);

	/* Information elements */		/* Information elements */
	pItem = (PWLAN_IE)((unsigned char *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)))		pItem = (PWLAN_IE)((unsigned char *)
	+ WLAN_BEACON_OFF_SSID);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))) +
			WLAN_BEACON_OFF_SSID);
	while (((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) {		while (((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) {
	switch (pItem->byElementID) {		switch (pItem->byElementID) {
	case WLAN_EID_SSID:		case WLAN_EID_SSID:
	@@ -171,7 +178,8 @@ vMgrDecodeBeacon(
	case WLAN_EID_RSN_WPA:		case WLAN_EID_RSN_WPA:
	if (pFrame->pRSNWPA == NULL) {		if (pFrame->pRSNWPA == NULL) {
	if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)		if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)
	pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem;		pFrame->pRSNWPA =
			(PWLAN_IE_RSN_EXT)pItem;
	}		}
	break;		break;

	@@ -181,7 +189,8 @@ vMgrDecodeBeacon(
	break;		break;
	case WLAN_EID_EXTSUPP_RATES:		case WLAN_EID_EXTSUPP_RATES:
	if (pFrame->pExtSuppRates == NULL)		if (pFrame->pExtSuppRates == NULL)
	pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;		pFrame->pExtSuppRates =
			(PWLAN_IE_SUPP_RATES)pItem;
	break;		break;

	case WLAN_EID_COUNTRY: /* 7 */		case WLAN_EID_COUNTRY: /* 7 */
	@@ -191,7 +200,8 @@ vMgrDecodeBeacon(

	case WLAN_EID_PWR_CONSTRAINT: /* 32 */		case WLAN_EID_PWR_CONSTRAINT: /* 32 */
	if (pFrame->pIE_PowerConstraint == NULL)		if (pFrame->pIE_PowerConstraint == NULL)
	pFrame->pIE_PowerConstraint = (PWLAN_IE_PW_CONST)pItem;		pFrame->pIE_PowerConstraint =
			(PWLAN_IE_PW_CONST)pItem;
	break;		break;

	case WLAN_EID_CH_SWITCH: /* 37 */		case WLAN_EID_CH_SWITCH: /* 37 */
	@@ -210,7 +220,9 @@ vMgrDecodeBeacon(
	break;		break;

	default:		default:
	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in beacon decode.\n", pItem->byElementID);		DBG_PRT(MSG_LEVEL_DEBUG,
			KERN_INFO "Unrecognized EID=%dd in beacon decode.\n",
			pItem->byElementID);
	break;		break;

	}		}
	@@ -282,9 +294,11 @@ vMgrEncodeDisassociation(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwReason = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwReason = (unsigned short *)
	+ WLAN_DISASSOC_OFF_REASON);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_DISASSOC_OFF_REASON + sizeof(*(pFrame->pwReason));		WLAN_DISASSOC_OFF_REASON);
			pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_DISASSOC_OFF_REASON +
			sizeof(*(pFrame->pwReason));

	return;		return;
	}		}
	@@ -308,8 +322,9 @@ vMgrDecodeDisassociation(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwReason = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwReason = (unsigned short *)
	+ WLAN_DISASSOC_OFF_REASON);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_DISASSOC_OFF_REASON);

	return;		return;
	}		}
	@@ -332,11 +347,14 @@ vMgrEncodeAssocRequest(
	{		{
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwCapInfo = (unsigned short *)
	+ WLAN_ASSOCREQ_OFF_CAP_INFO);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwListenInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_ASSOCREQ_OFF_CAP_INFO);
	+ WLAN_ASSOCREQ_OFF_LISTEN_INT);		pFrame->pwListenInterval = (unsigned short *)
	pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_ASSOCREQ_OFF_LISTEN_INT + sizeof(*(pFrame->pwListenInterval));		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_ASSOCREQ_OFF_LISTEN_INT);
			pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_ASSOCREQ_OFF_LISTEN_INT +
			sizeof(*(pFrame->pwListenInterval));
	return;		return;
	}		}

	@@ -360,10 +378,12 @@ vMgrDecodeAssocRequest(

	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwCapInfo = (unsigned short *)
	+ WLAN_ASSOCREQ_OFF_CAP_INFO);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwListenInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_ASSOCREQ_OFF_CAP_INFO);
	+ WLAN_ASSOCREQ_OFF_LISTEN_INT);		pFrame->pwListenInterval = (unsigned short *)
			(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_ASSOCREQ_OFF_LISTEN_INT);

	/* Information elements */		/* Information elements */
	pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
	@@ -377,7 +397,8 @@ vMgrDecodeAssocRequest(
	break;		break;
	case WLAN_EID_SUPP_RATES:		case WLAN_EID_SUPP_RATES:
	if (pFrame->pSuppRates == NULL)		if (pFrame->pSuppRates == NULL)
	pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES)pItem;		pFrame->pSuppRates =
			(PWLAN_IE_SUPP_RATES)pItem;
	break;		break;

	case WLAN_EID_RSN:		case WLAN_EID_RSN:
	@@ -387,16 +408,19 @@ vMgrDecodeAssocRequest(
	case WLAN_EID_RSN_WPA:		case WLAN_EID_RSN_WPA:
	if (pFrame->pRSNWPA == NULL) {		if (pFrame->pRSNWPA == NULL) {
	if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)		if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)
	pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem;		pFrame->pRSNWPA =
			(PWLAN_IE_RSN_EXT)pItem;
	}		}
	break;		break;
	case WLAN_EID_EXTSUPP_RATES:		case WLAN_EID_EXTSUPP_RATES:
	if (pFrame->pExtSuppRates == NULL)		if (pFrame->pExtSuppRates == NULL)
	pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;		pFrame->pExtSuppRates =
			(PWLAN_IE_SUPP_RATES)pItem;
	break;		break;

	default:		default:
	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in assocreq decode.\n",		DBG_PRT(MSG_LEVEL_DEBUG,
			KERN_INFO "Unrecognized EID=%dd in assocreq decode.\n",
	pItem->byElementID);		pItem->byElementID);
	break;		break;
	}		}
	@@ -424,14 +448,17 @@ vMgrEncodeAssocResponse(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwCapInfo = (unsigned short *)
	+ WLAN_ASSOCRESP_OFF_CAP_INFO);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwStatus = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_ASSOCRESP_OFF_CAP_INFO);
	+ WLAN_ASSOCRESP_OFF_STATUS);		pFrame->pwStatus = (unsigned short *)
	pFrame->pwAid = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	+ WLAN_ASSOCRESP_OFF_AID);		WLAN_ASSOCRESP_OFF_STATUS);
	pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_ASSOCRESP_OFF_AID		pFrame->pwAid = (unsigned short *)
	+ sizeof(*(pFrame->pwAid));		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_ASSOCRESP_OFF_AID);
			pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_ASSOCRESP_OFF_AID +
			sizeof(*(pFrame->pwAid));

	return;		return;
	}		}
	@@ -457,16 +484,20 @@ vMgrDecodeAssocResponse(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwCapInfo = (unsigned short *)
	+ WLAN_ASSOCRESP_OFF_CAP_INFO);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwStatus = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_ASSOCRESP_OFF_CAP_INFO);
	+ WLAN_ASSOCRESP_OFF_STATUS);		pFrame->pwStatus = (unsigned short *)
	pFrame->pwAid = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	+ WLAN_ASSOCRESP_OFF_AID);		WLAN_ASSOCRESP_OFF_STATUS);
			pFrame->pwAid = (unsigned short *)
			(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_ASSOCRESP_OFF_AID);

	/* Information elements */		/* Information elements */
	pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES)
	+ WLAN_ASSOCRESP_OFF_SUPP_RATES);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_ASSOCRESP_OFF_SUPP_RATES);

	pItem = (PWLAN_IE)(pFrame->pSuppRates);		pItem = (PWLAN_IE)(pFrame->pSuppRates);
	pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);		pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);
	@@ -474,7 +505,9 @@ vMgrDecodeAssocResponse(
	if ((((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) &&		if ((((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) &&
	(pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {		(pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {
	pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;		pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;
	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pFrame->pExtSuppRates=[%p].\n", pItem);		DBG_PRT(MSG_LEVEL_DEBUG,
			KERN_INFO "pFrame->pExtSuppRates=[%p].\n",
			pItem);
	} else {		} else {
	pFrame->pExtSuppRates = NULL;		pFrame->pExtSuppRates = NULL;
	}		}
	@@ -500,13 +533,17 @@ vMgrEncodeReassocRequest(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwCapInfo = (unsigned short *)
	+ WLAN_REASSOCREQ_OFF_CAP_INFO);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwListenInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_REASSOCREQ_OFF_CAP_INFO);
	+ WLAN_REASSOCREQ_OFF_LISTEN_INT);		pFrame->pwListenInterval = (unsigned short *)
	pFrame->pAddrCurrAP = (PIEEE_ADDR)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	+ WLAN_REASSOCREQ_OFF_CURR_AP);		WLAN_REASSOCREQ_OFF_LISTEN_INT);
	pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCREQ_OFF_CURR_AP + sizeof(*(pFrame->pAddrCurrAP));		pFrame->pAddrCurrAP = (PIEEE_ADDR)
			(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_REASSOCREQ_OFF_CURR_AP);
			pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCREQ_OFF_CURR_AP +
			sizeof(*(pFrame->pAddrCurrAP));

	return;		return;
	}		}
	@@ -531,12 +568,15 @@ vMgrDecodeReassocRequest(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwCapInfo = (unsigned short *)
	+ WLAN_REASSOCREQ_OFF_CAP_INFO);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwListenInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_REASSOCREQ_OFF_CAP_INFO);
	+ WLAN_REASSOCREQ_OFF_LISTEN_INT);		pFrame->pwListenInterval = (unsigned short *)
	pFrame->pAddrCurrAP = (PIEEE_ADDR)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	+ WLAN_REASSOCREQ_OFF_CURR_AP);		WLAN_REASSOCREQ_OFF_LISTEN_INT);
			pFrame->pAddrCurrAP = (PIEEE_ADDR)
			(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_REASSOCREQ_OFF_CURR_AP);

	/* Information elements */		/* Information elements */
	pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
	@@ -550,7 +590,8 @@ vMgrDecodeReassocRequest(
	break;		break;
	case WLAN_EID_SUPP_RATES:		case WLAN_EID_SUPP_RATES:
	if (pFrame->pSuppRates == NULL)		if (pFrame->pSuppRates == NULL)
	pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES)pItem;		pFrame->pSuppRates =
			(PWLAN_IE_SUPP_RATES)pItem;
	break;		break;

	case WLAN_EID_RSN:		case WLAN_EID_RSN:
	@@ -560,16 +601,19 @@ vMgrDecodeReassocRequest(
	case WLAN_EID_RSN_WPA:		case WLAN_EID_RSN_WPA:
	if (pFrame->pRSNWPA == NULL) {		if (pFrame->pRSNWPA == NULL) {
	if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)		if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)
	pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem;		pFrame->pRSNWPA =
			(PWLAN_IE_RSN_EXT)pItem;
	}		}
	break;		break;

	case WLAN_EID_EXTSUPP_RATES:		case WLAN_EID_EXTSUPP_RATES:
	if (pFrame->pExtSuppRates == NULL)		if (pFrame->pExtSuppRates == NULL)
	pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;		pFrame->pExtSuppRates =
			(PWLAN_IE_SUPP_RATES)pItem;
	break;		break;
	default:		default:
	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in reassocreq decode.\n",		DBG_PRT(MSG_LEVEL_DEBUG,
			KERN_INFO "Unrecognized EID=%dd in reassocreq decode.\n",
	pItem->byElementID);		pItem->byElementID);
	break;		break;
	}		}
	@@ -631,16 +675,20 @@ vMgrDecodeProbeRequest(

	case WLAN_EID_SUPP_RATES:		case WLAN_EID_SUPP_RATES:
	if (pFrame->pSuppRates == NULL)		if (pFrame->pSuppRates == NULL)
	pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES)pItem;		pFrame->pSuppRates =
			(PWLAN_IE_SUPP_RATES)pItem;
	break;		break;

	case WLAN_EID_EXTSUPP_RATES:		case WLAN_EID_EXTSUPP_RATES:
	if (pFrame->pExtSuppRates == NULL)		if (pFrame->pExtSuppRates == NULL)
	pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;		pFrame->pExtSuppRates =
			(PWLAN_IE_SUPP_RATES)pItem;
	break;		break;

	default:		default:
	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Bad EID=%dd in probereq\n", pItem->byElementID);		DBG_PRT(MSG_LEVEL_DEBUG,
			KERN_INFO "Bad EID=%dd in probereq\n",
			pItem->byElementID);
	break;		break;
	}		}

	@@ -668,12 +716,15 @@ vMgrEncodeProbeResponse(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pqwTimestamp = (PQWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pqwTimestamp = (PQWORD)
	+ WLAN_PROBERESP_OFF_TS);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwBeaconInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_PROBERESP_OFF_TS);
	+ WLAN_PROBERESP_OFF_BCN_INT);		pFrame->pwBeaconInterval = (unsigned short *)
	pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	+ WLAN_PROBERESP_OFF_CAP_INFO);		WLAN_PROBERESP_OFF_BCN_INT);
			pFrame->pwCapInfo = (unsigned short *)
			(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_PROBERESP_OFF_CAP_INFO);

	pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_PROBERESP_OFF_CAP_INFO +		pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_PROBERESP_OFF_CAP_INFO +
	sizeof(*(pFrame->pwCapInfo));		sizeof(*(pFrame->pwCapInfo));
	@@ -702,12 +753,15 @@ vMgrDecodeProbeResponse(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pqwTimestamp = (PQWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pqwTimestamp = (PQWORD)
	+ WLAN_PROBERESP_OFF_TS);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwBeaconInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_PROBERESP_OFF_TS);
	+ WLAN_PROBERESP_OFF_BCN_INT);		pFrame->pwBeaconInterval = (unsigned short *)
	pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	+ WLAN_PROBERESP_OFF_CAP_INFO);		WLAN_PROBERESP_OFF_BCN_INT);
			pFrame->pwCapInfo = (unsigned short *)
			(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_PROBERESP_OFF_CAP_INFO);

	/* Information elements */		/* Information elements */
	pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
	@@ -721,7 +775,8 @@ vMgrDecodeProbeResponse(
	break;		break;
	case WLAN_EID_SUPP_RATES:		case WLAN_EID_SUPP_RATES:
	if (pFrame->pSuppRates == NULL)		if (pFrame->pSuppRates == NULL)
	pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES)pItem;		pFrame->pSuppRates =
			(PWLAN_IE_SUPP_RATES)pItem;
	break;		break;
	case WLAN_EID_FH_PARMS:		case WLAN_EID_FH_PARMS:
	break;		break;
	@@ -735,7 +790,8 @@ vMgrDecodeProbeResponse(
	break;		break;
	case WLAN_EID_IBSS_PARMS:		case WLAN_EID_IBSS_PARMS:
	if (pFrame->pIBSSParms == NULL)		if (pFrame->pIBSSParms == NULL)
	pFrame->pIBSSParms = (PWLAN_IE_IBSS_PARMS)pItem;		pFrame->pIBSSParms =
			(PWLAN_IE_IBSS_PARMS)pItem;
	break;		break;

	case WLAN_EID_RSN:		case WLAN_EID_RSN:
	@@ -745,7 +801,8 @@ vMgrDecodeProbeResponse(
	case WLAN_EID_RSN_WPA:		case WLAN_EID_RSN_WPA:
	if (pFrame->pRSNWPA == NULL) {		if (pFrame->pRSNWPA == NULL) {
	if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)		if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)
	pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem;		pFrame->pRSNWPA =
			(PWLAN_IE_RSN_EXT)pItem;
	}		}
	break;		break;
	case WLAN_EID_ERP:		case WLAN_EID_ERP:
	@@ -754,7 +811,8 @@ vMgrDecodeProbeResponse(
	break;		break;
	case WLAN_EID_EXTSUPP_RATES:		case WLAN_EID_EXTSUPP_RATES:
	if (pFrame->pExtSuppRates == NULL)		if (pFrame->pExtSuppRates == NULL)
	pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;		pFrame->pExtSuppRates =
			(PWLAN_IE_SUPP_RATES)pItem;
	break;		break;

	case WLAN_EID_COUNTRY: /* 7 */		case WLAN_EID_COUNTRY: /* 7 */
	@@ -764,7 +822,8 @@ vMgrDecodeProbeResponse(

	case WLAN_EID_PWR_CONSTRAINT: /* 32 */		case WLAN_EID_PWR_CONSTRAINT: /* 32 */
	if (pFrame->pIE_PowerConstraint == NULL)		if (pFrame->pIE_PowerConstraint == NULL)
	pFrame->pIE_PowerConstraint = (PWLAN_IE_PW_CONST)pItem;		pFrame->pIE_PowerConstraint =
			(PWLAN_IE_PW_CONST)pItem;
	break;		break;

	case WLAN_EID_CH_SWITCH: /* 37 */		case WLAN_EID_CH_SWITCH: /* 37 */
	@@ -783,7 +842,9 @@ vMgrDecodeProbeResponse(
	break;		break;

	default:		default:
	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Bad EID=%dd in proberesp\n", pItem->byElementID);		DBG_PRT(MSG_LEVEL_DEBUG,
			KERN_INFO "Bad EID=%dd in proberesp\n",
			pItem->byElementID);
	break;		break;
	}		}

	@@ -811,13 +872,17 @@ vMgrEncodeAuthen(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwAuthAlgorithm = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwAuthAlgorithm = (unsigned short *)
	+ WLAN_AUTHEN_OFF_AUTH_ALG);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwAuthSequence = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_AUTHEN_OFF_AUTH_ALG);
	+ WLAN_AUTHEN_OFF_AUTH_SEQ);		pFrame->pwAuthSequence = (unsigned short *)
	pFrame->pwStatus = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	+ WLAN_AUTHEN_OFF_STATUS);		WLAN_AUTHEN_OFF_AUTH_SEQ);
	pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_AUTHEN_OFF_STATUS + sizeof(*(pFrame->pwStatus));		pFrame->pwStatus = (unsigned short *)
			(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_AUTHEN_OFF_STATUS);
			pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_AUTHEN_OFF_STATUS +
			sizeof(*(pFrame->pwStatus));

	return;		return;
	}		}
	@@ -843,12 +908,15 @@ vMgrDecodeAuthen(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwAuthAlgorithm = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwAuthAlgorithm = (unsigned short *)
	+ WLAN_AUTHEN_OFF_AUTH_ALG);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwAuthSequence = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_AUTHEN_OFF_AUTH_ALG);
	+ WLAN_AUTHEN_OFF_AUTH_SEQ);		pFrame->pwAuthSequence = (unsigned short *)
	pFrame->pwStatus = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	+ WLAN_AUTHEN_OFF_STATUS);		WLAN_AUTHEN_OFF_AUTH_SEQ);
			pFrame->pwStatus = (unsigned short *)
			(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_AUTHEN_OFF_STATUS);

	/* Information elements */		/* Information elements */
	pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
	@@ -880,9 +948,11 @@ vMgrEncodeDeauthen(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwReason = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwReason = (unsigned short *)
	+ WLAN_DEAUTHEN_OFF_REASON);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_DEAUTHEN_OFF_REASON + sizeof(*(pFrame->pwReason));		WLAN_DEAUTHEN_OFF_REASON);
			pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_DEAUTHEN_OFF_REASON +
			sizeof(*(pFrame->pwReason));

	return;		return;
	}		}
	@@ -906,8 +976,9 @@ vMgrDecodeDeauthen(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwReason = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwReason = (unsigned short *)
	+ WLAN_DEAUTHEN_OFF_REASON);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_DEAUTHEN_OFF_REASON);

	return;		return;
	}		}
	@@ -931,14 +1002,18 @@ vMgrEncodeReassocResponse(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwCapInfo = (unsigned short *)
	+ WLAN_REASSOCRESP_OFF_CAP_INFO);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwStatus = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_REASSOCRESP_OFF_CAP_INFO);
	+ WLAN_REASSOCRESP_OFF_STATUS);		pFrame->pwStatus = (unsigned short *)
	pFrame->pwAid = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	+ WLAN_REASSOCRESP_OFF_AID);		WLAN_REASSOCRESP_OFF_STATUS);
			pFrame->pwAid = (unsigned short *)
	pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCRESP_OFF_AID + sizeof(*(pFrame->pwAid));		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_REASSOCRESP_OFF_AID);

			pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCRESP_OFF_AID +
			sizeof(*(pFrame->pwAid));

	return;		return;
	}		}
	@@ -964,16 +1039,20 @@ vMgrDecodeReassocResponse(
	pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

	/* Fixed Fields */		/* Fixed Fields */
	pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pwCapInfo = (unsigned short *)
	+ WLAN_REASSOCRESP_OFF_CAP_INFO);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	pFrame->pwStatus = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		WLAN_REASSOCRESP_OFF_CAP_INFO);
	+ WLAN_REASSOCRESP_OFF_STATUS);		pFrame->pwStatus = (unsigned short *)
	pFrame->pwAid = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
	+ WLAN_REASSOCRESP_OFF_AID);		WLAN_REASSOCRESP_OFF_STATUS);
			pFrame->pwAid = (unsigned short *)
			(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_REASSOCRESP_OFF_AID);

	/* Information elements */		/* Information elements */
	pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))		pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES)
	+ WLAN_REASSOCRESP_OFF_SUPP_RATES);		(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +
			WLAN_REASSOCRESP_OFF_SUPP_RATES);

	pItem = (PWLAN_IE)(pFrame->pSuppRates);		pItem = (PWLAN_IE)(pFrame->pSuppRates);
	pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);		pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);