Commit 79566eb2 authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman
Browse files

Staging: vt6655: move channel mapping code from card.c to channel.c 



Move functions managing the channel mapping to a new channel.c file, as done in
the staging VT6656 driver. The function names contained in card.c were prefixed
with CARD followed by the first letter of the return code, remove this and use
more coherent function names.

The following functions moved and were renamed:

ChannelValid			-> is_channel_valid
CARDbSetChannel			-> set_channel
CARDvInitChannelTable		-> init_channel_table
CARDbyGetChannelMapping 	-> get_channel_mapping
CARDvSetCountryInfo		-> set_country_info
CARDbySetSupportChannels 	-> set_support_channels
CARDbChannelGetList		-> channel_get_list
CARDvSetCountryIE		-> set_country_IE
CARDbGetChannelMapInfo		-> get_channel_map_info
CARDvSetChannelMapInfo		-> set_channel_map_info
CARDvClearChannelMapInfo	-> clear_channel_map_info
CARDbyAutoChannelSelect		-> auto_channel_select
CARDbyGetChannelNumber		-> get_channel_number

Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2a1a1749

drivers/staging/vt6655/IEEE11h.c

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "device.h"

#include "wmgr.h"

#include "rxtx.h"

#include "channel.h"



/*---------------------  Static Definitions -------------------------*/

static int          msglevel                =MSG_LEVEL_INFO;
@@ -245,7 +246,7 @@ IEEE11hbMgrRxAction ( 
                    // valid element id

                    CARDbChannelSwitch( pMgmt->pAdapter,

                                        pChannelSwitch->byMode,

                                        CARDbyGetChannelMapping(pMgmt->pAdapter, pChannelSwitch->byChannel, pMgmt->eCurrentPHYMode),

                                        get_channel_mapping(pMgmt->pAdapter, pChannelSwitch->byChannel, pMgmt->eCurrentPHYMode),

                                        pChannelSwitch->byCount

                                        );

                }

drivers/staging/vt6655/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ EXTRA_CFLAGS += -DHOSTAP 


vt6655_stage-y +=	device_main.o \

	card.o \

	channel.o \

	mac.o \

	baseband.o \

	wctl.o \

drivers/staging/vt6655/TODO

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ TODO: 
- prepare for merge with vt6656 driver:

  - rename DEVICE_PRT() to DBG_PRT() -- done

  - share 80211*.h includes

  - move code for channel mapping from card.c to channel.c

  - split rf.c

  - remove dead code

  - abstract VT3253 chipset specific code

drivers/staging/vt6655/bssdb.c

+3 −4
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include "baseband.h"

#include "rf.h"

#include "card.h"

#include "channel.h"

#include "mac.h"

#include "wpa2.h"

#include "iowpa.h"
@@ -527,8 +528,7 @@ BSSbInsertToBSSList ( 


    if ((pIE_Country != NULL) &&

        (pMgmt->b11hEnable == TRUE)) {

        CARDvSetCountryInfo(pMgmt->pAdapter,

                            pBSSList->eNetworkTypeInUse,

        set_country_info(pMgmt->pAdapter, pBSSList->eNetworkTypeInUse,

                            pIE_Country);

    }
@@ -704,8 +704,7 @@ BSSbUpdateToBSSList ( 


    if ((pIE_Country != NULL) &&

        (pMgmt->b11hEnable == TRUE)) {

        CARDvSetCountryInfo(pMgmt->pAdapter,

                            pBSSList->eNetworkTypeInUse,

        set_country_info(pMgmt->pAdapter, pBSSList->eNetworkTypeInUse,

                            pIE_Country);

    }

drivers/staging/vt6655/card.c

+4 −877

File changed.

Preview size limit exceeded, changes collapsed.