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

staging: vt6655: s_vCalculateOFDMRParameter use bb_type for CARD_PHY_TYPE 



using u8 for bb_type and replacing PHY_TYPE_11A with BB_TYPE_11A

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

drivers/staging/vt6655/card.c

+10 −10
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static 
void

s_vCalculateOFDMRParameter(

	unsigned char byRate,

	CARD_PHY_TYPE ePHYType,

	u8 bb_type,

	unsigned char *pbyTxRate,

	unsigned char *pbyRsvTime

);
@@ -102,14 +102,14 @@ static 
void

s_vCalculateOFDMRParameter(

	unsigned char byRate,

	CARD_PHY_TYPE ePHYType,

	u8 bb_type,

	unsigned char *pbyTxRate,

	unsigned char *pbyRsvTime

)

{

	switch (byRate) {

	case RATE_6M:

		if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */

		if (bb_type == BB_TYPE_11A) { /* 5GHZ */

			*pbyTxRate = 0x9B;

			*pbyRsvTime = 44;

		} else {
@@ -119,7 +119,7 @@ s_vCalculateOFDMRParameter( 
		break;



	case RATE_9M:

		if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */

		if (bb_type == BB_TYPE_11A) { /* 5GHZ */

			*pbyTxRate = 0x9F;

			*pbyRsvTime = 36;

		} else {
@@ -129,7 +129,7 @@ s_vCalculateOFDMRParameter( 
		break;



	case RATE_12M:

		if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */

		if (bb_type == BB_TYPE_11A) { /* 5GHZ */

			*pbyTxRate = 0x9A;

			*pbyRsvTime = 32;

		} else {
@@ -139,7 +139,7 @@ s_vCalculateOFDMRParameter( 
		break;



	case RATE_18M:

		if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */

		if (bb_type == BB_TYPE_11A) { /* 5GHZ */

			*pbyTxRate = 0x9E;

			*pbyRsvTime = 28;

		} else {
@@ -149,7 +149,7 @@ s_vCalculateOFDMRParameter( 
		break;



	case RATE_36M:

		if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */

		if (bb_type == BB_TYPE_11A) { /* 5GHZ */

			*pbyTxRate = 0x9D;

			*pbyRsvTime = 24;

		} else {
@@ -159,7 +159,7 @@ s_vCalculateOFDMRParameter( 
		break;



	case RATE_48M:

		if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */

		if (bb_type == BB_TYPE_11A) { /* 5GHZ */

			*pbyTxRate = 0x98;

			*pbyRsvTime = 24;

		} else {
@@ -169,7 +169,7 @@ s_vCalculateOFDMRParameter( 
		break;



	case RATE_54M:

		if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */

		if (bb_type == BB_TYPE_11A) { /* 5GHZ */

			*pbyTxRate = 0x9C;

			*pbyRsvTime = 24;

		} else {
@@ -180,7 +180,7 @@ s_vCalculateOFDMRParameter( 


	case RATE_24M:

	default:

		if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */

		if (bb_type == BB_TYPE_11A) { /* 5GHZ */

			*pbyTxRate = 0x99;

			*pbyRsvTime = 28;

		} else {