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

staging: vt6656: iwctl/key/rf use new structures. 



This patch cleans up function declarations, definitions and local variables
were appropriate replacing types defined in "ttype.h" with linux/types.h

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

drivers/staging/vt6656/iwctl.c

+50 −50
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static int msglevel = MSG_LEVEL_INFO; 


struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	long ldBm;



	pDevice->wstats.status = pDevice->eOPMode;
@@ -91,9 +91,9 @@ int iwctl_giwname(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwscan(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_point *wrq = &wrqu->data;

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct iw_scan_req *req = (struct iw_scan_req *)extra;

	BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];

	PWLAN_IE_SSID pItemSSID = NULL;
@@ -169,8 +169,8 @@ int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info, 
	int ii;

	int jj;

	int kk;

	PSDevice pDevice = netdev_priv(dev);

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	PKnownBSS pBSS;

	PWLAN_IE_SSID pItemSSID;

	PWLAN_IE_SUPP_RATES pSuppRates;
@@ -309,7 +309,7 @@ int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwfreq(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_freq *wrq = &wrqu->freq;

	int rc = 0;
@@ -348,9 +348,9 @@ int iwctl_siwfreq(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwfreq(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_freq *wrq = &wrqu->freq;

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWFREQ\n");
@@ -379,9 +379,9 @@ int iwctl_giwfreq(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwmode(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	__u32 *wmode = &wrqu->mode;

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	int rc = 0;



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWMODE\n");
@@ -492,9 +492,9 @@ int iwctl_siwmode(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwmode(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	__u32 *wmode = &wrqu->mode;

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWMODE\n");
@@ -631,9 +631,9 @@ int iwctl_giwrange(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwap(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct sockaddr *wrq = &wrqu->ap_addr;

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	int rc = 0;

	BYTE ZeroBSSID[WLAN_BSSID_LEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
@@ -683,9 +683,9 @@ int iwctl_siwap(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwap(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct sockaddr *wrq = &wrqu->ap_addr;

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAP\n");
@@ -713,8 +713,8 @@ int iwctl_giwaplist(struct net_device *dev, struct iw_request_info *info, 
	struct iw_point *wrq = &wrqu->data;

	struct sockaddr *sock;

	struct iw_quality *qual;

	PSDevice pDevice = netdev_priv(dev);

	PSMgmtObject pMgmt = &pDevice->sMgmtObj;

	struct vnt_private *pDevice = netdev_priv(dev);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	PKnownBSS pBSS = &pMgmt->sBSSList[0];

	int ii;

	int jj;
@@ -771,9 +771,9 @@ int iwctl_giwaplist(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_point	*wrq = &wrqu->essid;

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	PWLAN_IE_SSID pItemSSID;



	if (pMgmt == NULL)
@@ -878,9 +878,9 @@ int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwessid(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_point	*wrq = &wrqu->essid;

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	PWLAN_IE_SSID pItemSSID;



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWESSID\n");
@@ -908,7 +908,7 @@ int iwctl_giwessid(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwrate(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_param *wrq = &wrqu->bitrate;

	int rc = 0;

	u8 brate = 0;
@@ -986,9 +986,9 @@ int iwctl_siwrate(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwrate(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_param *wrq = &wrqu->bitrate;

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRATE\n");
@@ -1037,7 +1037,7 @@ int iwctl_giwrate(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwrts(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_param *wrq = &wrqu->rts;



	if ((wrq->value < 0 || wrq->value > 2312) && !wrq->disabled)
@@ -1057,7 +1057,7 @@ int iwctl_siwrts(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwrts(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_param *wrq = &wrqu->rts;



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRTS\n");
@@ -1073,7 +1073,7 @@ int iwctl_giwrts(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwfrag(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_param *wrq = &wrqu->frag;

	int rc = 0;

	int fthr = wrq->value;
@@ -1097,7 +1097,7 @@ int iwctl_siwfrag(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwfrag(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_param *wrq = &wrqu->frag;



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWFRAG\n");
@@ -1113,7 +1113,7 @@ int iwctl_giwfrag(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwretry(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_param *wrq = &wrqu->retry;

	int rc = 0;
@@ -1146,7 +1146,7 @@ int iwctl_siwretry(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwretry(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_param *wrq = &wrqu->retry;

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRETRY\n");

	wrq->disabled = 0; // Can't be disabled
@@ -1173,8 +1173,8 @@ int iwctl_giwretry(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct iw_point *wrq = &wrqu->encoding;

	u32 dwKeyIndex = (u32)(wrq->flags & IW_ENCODE_INDEX);

	int ii;
@@ -1271,8 +1271,8 @@ int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwencode(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct iw_point *wrq = &wrqu->encoding;

	char abyKey[WLAN_WEP232_KEYLEN];
@@ -1333,8 +1333,8 @@ int iwctl_giwencode(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwpower(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct iw_param *wrq = &wrqu->power;

	int rc = 0;
@@ -1385,8 +1385,8 @@ int iwctl_siwpower(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwpower(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct iw_param *wrq = &wrqu->power;

	int mode = pDevice->ePSMode;
@@ -1418,7 +1418,7 @@ int iwctl_giwpower(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwsens(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct iw_param *wrq = &wrqu->sens;

	long ldBm;
@@ -1437,8 +1437,8 @@ int iwctl_giwsens(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwauth(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct iw_param *wrq = &wrqu->param;

	int ret = 0;

	static int wpa_version = 0; // must be static to save the last value, einsn liu
@@ -1547,8 +1547,8 @@ int iwctl_giwauth(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwgenie(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct iw_point *wrq = &wrqu->data;

	int ret = 0;
@@ -1582,8 +1582,8 @@ int iwctl_siwgenie(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwgenie(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct iw_point *wrq = &wrqu->data;

	int ret = 0;

	int space = wrq->length;
@@ -1608,8 +1608,8 @@ int iwctl_giwgenie(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwencodeext(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct iw_point *wrq = &wrqu->encoding;

	struct iw_encode_ext *ext = (struct iw_encode_ext*)extra;

	struct viawget_wpa_param *param=NULL;
@@ -1741,8 +1741,8 @@ int iwctl_giwencodeext(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwmlme(struct net_device *dev, struct iw_request_info *info,

		union iwreq_data *wrqu, char *extra)

{

	PSDevice pDevice = netdev_priv(dev);

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	struct vnt_private *pDevice = netdev_priv(dev);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct iw_mlme *mlme = (struct iw_mlme *)extra;

	int ret = 0;

drivers/staging/vt6656/key.c

+52 −88
Original line number Diff line number Diff line
@@ -60,13 +60,12 @@ static int msglevel =MSG_LEVEL_INFO; 
/*---------------------  Static Variables  --------------------------*/



/*---------------------  Static Functions  --------------------------*/

static void s_vCheckKeyTableValid(void *pDeviceHandler,

static void s_vCheckKeyTableValid(struct vnt_private *pDevice,

	PSKeyManagement pTable)

{

    PSDevice    pDevice = (PSDevice) pDeviceHandler;

	int i;

    WORD        wLength = 0;

    BYTE        pbyData[MAX_KEY_TABLE];

	u16 wLength = 0;

	u8 pbyData[MAX_KEY_TABLE];



    for (i=0;i<MAX_KEY_TABLE;i++) {

        if ((pTable->KeyTable[i].bInUse == TRUE) &&
@@ -112,12 +111,10 @@ static void s_vCheckKeyTableValid(void *pDeviceHandler, 
 * Return Value: none

 *

 */

void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable)

void KeyvInitTable(struct vnt_private *pDevice, PSKeyManagement pTable)

{

    PSDevice    pDevice = (PSDevice) pDeviceHandler;

    int i;

    int jj;

    BYTE       pbyData[MAX_KEY_TABLE+1];

	int i, jj;

	u8 pbyData[MAX_KEY_TABLE+1];



    spin_lock_irq(&pDevice->lock);

    for (i=0;i<MAX_KEY_TABLE;i++) {
@@ -164,7 +161,7 @@ void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable) 
 * Return Value: TRUE if found otherwise FALSE

 *

 */

BOOL KeybGetKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex,

int KeybGetKey(PSKeyManagement pTable, u8 *pbyBSSID, u32 dwKeyIndex,

	PSKeyItem *pKey)

{

	int i;
@@ -218,22 +215,13 @@ BOOL KeybGetKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex, 
 * Return Value: TRUE if success otherwise FALSE

 *

 */

BOOL KeybSetKey(

    void *pDeviceHandler,

    PSKeyManagement pTable,

    PBYTE           pbyBSSID,

    DWORD           dwKeyIndex,

	u32 uKeyLength,

	u64 *KeyRSC,

    PBYTE           pbyKey,

    BYTE            byKeyDecMode

    )

int KeybSetKey(struct vnt_private *pDevice, PSKeyManagement pTable,

	u8 *pbyBSSID, u32 dwKeyIndex, u32 uKeyLength, u64 *KeyRSC, u8 *pbyKey,

	u8 byKeyDecMode)

{

    PSDevice    pDevice = (PSDevice) pDeviceHandler;

    int         i,j;

    unsigned int        ii;

	PSKeyItem   pKey;

    unsigned int        uKeyIdx;

	int i, j, ii;

	u32 uKeyIdx;



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO

		"Enter KeybSetKey: %X\n", dwKeyIndex);
@@ -397,16 +385,12 @@ BOOL KeybSetKey( 
 * Return Value: TRUE if success otherwise FALSE

 *

 */

BOOL KeybRemoveKey(

    void *pDeviceHandler,

    PSKeyManagement pTable,

    PBYTE           pbyBSSID,

    DWORD           dwKeyIndex

    )



int KeybRemoveKey(struct vnt_private *pDevice, PSKeyManagement pTable,

	u8 *pbyBSSID, u32 dwKeyIndex)

{

    PSDevice    pDevice = (PSDevice) pDeviceHandler;

	int i;

    BOOL    bReturnValue = FALSE;

	int bReturnValue = FALSE;



    if (is_broadcast_ether_addr(pbyBSSID)) {

        // delete all keys
@@ -478,13 +462,9 @@ BOOL KeybRemoveKey( 
 * Return Value: TRUE if success otherwise FALSE

 *

 */

BOOL KeybRemoveAllKey(

    void *pDeviceHandler,

    PSKeyManagement pTable,

    PBYTE           pbyBSSID

    )

int KeybRemoveAllKey(struct vnt_private *pDevice, PSKeyManagement pTable,

	u8 *pbyBSSID)

{

    PSDevice    pDevice = (PSDevice) pDeviceHandler;

	int i, u;



    for (i=0;i<MAX_KEY_TABLE;i++) {
@@ -514,13 +494,9 @@ BOOL KeybRemoveAllKey( 
 * Return Value: TRUE if success otherwise FALSE

 *

 */

void KeyvRemoveWEPKey(

    void *pDeviceHandler,

    PSKeyManagement pTable,

    DWORD           dwKeyIndex

    )

void KeyvRemoveWEPKey(struct vnt_private *pDevice, PSKeyManagement pTable,

	u32 dwKeyIndex)

{

    PSDevice    pDevice = (PSDevice) pDeviceHandler;



   if ((dwKeyIndex & 0x000000FF) < MAX_GROUP_KEY) {

        if (pTable->KeyTable[MAX_KEY_TABLE-1].bInUse == TRUE) {
@@ -537,9 +513,8 @@ void KeyvRemoveWEPKey( 
    return;

}



void KeyvRemoveAllWEPKey(void *pDeviceHandler, PSKeyManagement pTable)

void KeyvRemoveAllWEPKey(struct vnt_private *pDevice, PSKeyManagement pTable)

{

	PSDevice pDevice = (PSDevice) pDeviceHandler;

	int i;



	for (i = 0; i < MAX_GROUP_KEY; i++)
@@ -559,12 +534,13 @@ void KeyvRemoveAllWEPKey(void *pDeviceHandler, PSKeyManagement pTable) 
 * Return Value: TRUE if found otherwise FALSE

 *

 */

BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType,

int KeybGetTransmitKey(PSKeyManagement pTable, u8 *pbyBSSID, u32 dwKeyType,

	PSKeyItem *pKey)

{

	int i, ii;



	*pKey = NULL;



    for (i = 0; i < MAX_KEY_TABLE; i++) {

        if ((pTable->KeyTable[i].bInUse == TRUE) &&

	    !compare_ether_addr(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {
@@ -636,11 +612,12 @@ BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType, 
 * Return Value: TRUE if found otherwise FALSE

 *

 */

BOOL KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey)

int KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey)

{

	int i;



	*pKey = NULL;



    for (i=0;i<MAX_KEY_TABLE;i++) {

        if ((pTable->KeyTable[i].bInUse == TRUE) &&

            (pTable->KeyTable[i].PairwiseKey.bKeyValid == TRUE)) {
@@ -667,20 +644,14 @@ BOOL KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey) 
 * Return Value: TRUE if success otherwise FALSE

 *

 */

BOOL KeybSetDefaultKey(

    void *pDeviceHandler,

    PSKeyManagement pTable,

    DWORD           dwKeyIndex,

	u32 uKeyLength,

	u64 *KeyRSC,

    PBYTE           pbyKey,

    BYTE            byKeyDecMode

    )



int KeybSetDefaultKey(struct vnt_private *pDevice, PSKeyManagement pTable,

	u32 dwKeyIndex, u32 uKeyLength, u64 *KeyRSC, u8 *pbyKey,

	u8 byKeyDecMode)

{

    PSDevice    pDevice = (PSDevice) pDeviceHandler;

    unsigned int        ii;

	int ii;

	PSKeyItem pKey;

    unsigned int        uKeyIdx;

	u32 uKeyIdx;



    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enter KeybSetDefaultKey: %1x, %d\n",

	    (int) dwKeyIndex, (int) uKeyLength);
@@ -783,21 +754,14 @@ BOOL KeybSetDefaultKey( 
 * Return Value: TRUE if success otherwise FALSE

 *

 */

BOOL KeybSetAllGroupKey(

    void *pDeviceHandler,

    PSKeyManagement pTable,

    DWORD           dwKeyIndex,

	u32 uKeyLength,

	u64 *KeyRSC,

    PBYTE           pbyKey,

    BYTE            byKeyDecMode

    )



int KeybSetAllGroupKey(struct vnt_private *pDevice, PSKeyManagement pTable,

	u32 dwKeyIndex, u32 uKeyLength, u64 *KeyRSC, u8 *pbyKey,

	u8 byKeyDecMode)

{

    PSDevice    pDevice = (PSDevice) pDeviceHandler;

    int         i;

    unsigned int        ii;

	int i, ii;

	PSKeyItem pKey;

    unsigned int        uKeyIdx;

	u32 uKeyIdx;



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %X\n",

		dwKeyIndex);

drivers/staging/vt6656/key.h

+32 −64
Original line number Diff line number Diff line
@@ -97,69 +97,37 @@ typedef struct tagSKeyManagement 


/*---------------------  Export Functions  --------------------------*/



void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable);

void KeyvInitTable(struct vnt_private *, PSKeyManagement pTable);



BOOL KeybGetKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex,

int KeybGetKey(PSKeyManagement pTable, u8 *pbyBSSID, u32 dwKeyIndex,

	PSKeyItem *pKey);



BOOL KeybSetKey(

    void *pDeviceHandler,

    PSKeyManagement pTable,

    PBYTE           pbyBSSID,

    DWORD           dwKeyIndex,

	u32 uKeyLength,

	u64 *KeyRSC,

    PBYTE           pbyKey,

    BYTE            byKeyDecMode

    );



BOOL KeybRemoveKey(

    void *pDeviceHandler,

    PSKeyManagement pTable,

    PBYTE           pbyBSSID,

    DWORD           dwKeyIndex

    );



BOOL KeybRemoveAllKey(

    void *pDeviceHandler,

    PSKeyManagement pTable,

    PBYTE           pbyBSSID

    );



void KeyvRemoveWEPKey(

    void *pDeviceHandler,

    PSKeyManagement pTable,

    DWORD           dwKeyIndex

    );



void KeyvRemoveAllWEPKey(

    void *pDeviceHandler,

    PSKeyManagement pTable

    );



BOOL KeybGetTransmitKey(PSKeyManagement pTable,	PBYTE pbyBSSID,	DWORD dwKeyType,

int KeybSetKey(struct vnt_private *, PSKeyManagement pTable, u8 *pbyBSSID,

	u32 dwKeyIndex, u32 uKeyLength, u64 *KeyRSC, u8 *pbyKey,

	u8 byKeyDecMode);



int KeybRemoveKey(struct vnt_private *, PSKeyManagement pTable,

	u8 *pbyBSSID, u32 dwKeyIndex);



int KeybRemoveAllKey(struct vnt_private *, PSKeyManagement pTable,

	u8 *pbyBSSID);



void KeyvRemoveWEPKey(struct vnt_private *, PSKeyManagement pTable,

	u32 dwKeyIndex);



void KeyvRemoveAllWEPKey(struct vnt_private *, PSKeyManagement pTable);



int KeybGetTransmitKey(PSKeyManagement pTable, u8 *pbyBSSID, u32 dwKeyType,

	PSKeyItem *pKey);



BOOL KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey);



BOOL KeybSetDefaultKey(

    void *pDeviceHandler,

    PSKeyManagement pTable,

    DWORD           dwKeyIndex,

	u32 uKeyLength,

	u64 *KeyRSC,

    PBYTE           pbyKey,

    BYTE            byKeyDecMode

    );



BOOL KeybSetAllGroupKey(

    void *pDeviceHandler,

    PSKeyManagement pTable,

    DWORD           dwKeyIndex,

	u32 uKeyLength,

	u64 *KeyRSC,

    PBYTE           pbyKey,

    BYTE            byKeyDecMode

    );

int KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey);



int KeybSetDefaultKey(struct vnt_private *, PSKeyManagement pTable,

	u32 dwKeyIndex, u32 uKeyLength, u64 *KeyRSC, u8 *pbyKey,

	u8 byKeyDecMode);



int KeybSetAllGroupKey(struct vnt_private *, PSKeyManagement pTable,

	u32 dwKeyIndex, u32 uKeyLength, u64 *KeyRSC, u8 *pbyKey,

	u8 byKeyDecMode);



#endif /* __KEY_H__ */

drivers/staging/vt6656/rf.c

+56 −78

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/vt6656/rf.h

+8 −18
Original line number Diff line number Diff line
@@ -60,25 +60,15 @@ 
/*---------------------  Export Classes  ----------------------------*/



/*---------------------  Export Variables  --------------------------*/

extern const BYTE RFaby11aChannelIndex[200];

extern const u8 RFaby11aChannelIndex[200];

/*---------------------  Export Functions  --------------------------*/



BOOL IFRFbWriteEmbedded(PSDevice pDevice, DWORD dwData);

BOOL RFbSetPower(PSDevice pDevice, unsigned int uRATE, unsigned int uCH);



BOOL RFbRawSetPower(

      PSDevice  pDevice,

      BYTE      byPwr,

      unsigned int      uRATE

    );



void RFvRSSITodBm(PSDevice pDevice, BYTE byCurrRSSI, long *pldBm);

void RFbRFTableDownload(PSDevice pDevice);



BOOL s_bVT3226D0_11bLoCurrentAdjust(

      PSDevice    pDevice,

      BYTE        byChannel,

      BOOL        b11bMode

    );

int IFRFbWriteEmbedded(struct vnt_private *, u32 dwData);

int RFbSetPower(struct vnt_private *, u32 uRATE, u32 uCH);

int RFbRawSetPower(struct vnt_private *, u8 byPwr, u32 uRATE);

void RFvRSSITodBm(struct vnt_private *, u8 byCurrRSSI, long *pldBm);

void RFbRFTableDownload(struct vnt_private *pDevice);

int s_bVT3226D0_11bLoCurrentAdjust(struct vnt_private *, u8 byChannel,

	int b11bMode);



#endif /* __RF_H__ */