OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: vt6655: rf/wpactl/wroute use struct vnt_private 

Replacing PSDevice.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-08-10 15:47:01 +01:00 committed by Greg Kroah-Hartman
parent 8f335dd136
commit 6af4336e64
6 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/vt6655/rf.c
View File

@ -746,7 +746,7 @@ static bool RFbAL2230SelectChannel(void __iomem *dwIoBase, unsigned char byChann
*
*/
bool RFbInit(
PSDevice pDevice
struct vnt_private *pDevice
)
{
bool bResult = true;
@ -897,7 +897,7 @@ bool RFvWriteWakeProgSyn(void __iomem *dwIoBase, unsigned char byRFType, unsigne
*
*/
bool RFbSetPower(
PSDevice pDevice,
struct vnt_private *pDevice,
unsigned int uRATE,
unsigned int uCH
)
@ -978,7 +978,7 @@ bool RFbSetPower(
*/
bool RFbRawSetPower(
PSDevice pDevice,
struct vnt_private *pDevice,
unsigned char byPwr,
unsigned int uRATE
)
@ -1042,7 +1042,7 @@ bool RFbRawSetPower(
-*/
void
RFvRSSITodBm(
PSDevice pDevice,
struct vnt_private *pDevice,
unsigned char byCurrRSSI,
long *pldBm
)

8
drivers/staging/vt6655/rf.h
View File

@ -77,19 +77,19 @@
bool IFRFbWriteEmbedded(void __iomem *dwIoBase, unsigned long dwData);
bool RFbSelectChannel(void __iomem *dwIoBase, unsigned char byRFType, unsigned char byChannel);
bool RFbInit(
PSDevice pDevice
struct vnt_private *
);
bool RFvWriteWakeProgSyn(void __iomem *dwIoBase, unsigned char byRFType, unsigned int uChannel);
bool RFbSetPower(PSDevice pDevice, unsigned int uRATE, unsigned int uCH);
bool RFbSetPower(struct vnt_private *, unsigned int uRATE, unsigned int uCH);
bool RFbRawSetPower(
PSDevice pDevice,
struct vnt_private *,
unsigned char byPwr,
unsigned int uRATE
);
void
RFvRSSITodBm(
PSDevice pDevice,
struct vnt_private *,
unsigned char byCurrRSSI,
long *pldBm
);

28
drivers/staging/vt6655/wpactl.c
View File

@ -83,13 +83,13 @@ static void wpadev_setup(struct net_device *dev)
*
*/
static int wpa_init_wpadev(PSDevice pDevice)
static int wpa_init_wpadev(struct vnt_private *pDevice)
{
PSDevice wpadev_priv;
struct vnt_private *wpadev_priv;
struct net_device *dev = pDevice->dev;
int ret = 0;
pDevice->wpadev = alloc_netdev(sizeof(PSDevice), "vntwpa",
pDevice->wpadev = alloc_netdev(sizeof(*wpadev_priv), "vntwpa",
NET_NAME_UNKNOWN, wpadev_setup);
if (pDevice->wpadev == NULL)
return -ENOMEM;
@ -134,7 +134,7 @@ static int wpa_init_wpadev(PSDevice pDevice)
*
*/
static int wpa_release_wpadev(PSDevice pDevice)
static int wpa_release_wpadev(struct vnt_private *pDevice)
{
if (pDevice->skb) {
dev_kfree_skb(pDevice->skb);
@ -166,7 +166,7 @@ static int wpa_release_wpadev(PSDevice pDevice)
*
*/
int wpa_set_wpadev(PSDevice pDevice, int val)
int wpa_set_wpadev(struct vnt_private *pDevice, int val)
{
if (val)
return wpa_init_wpadev(pDevice);
@ -188,7 +188,7 @@ int wpa_set_wpadev(PSDevice pDevice, int val)
*
*/
int wpa_set_keys(PSDevice pDevice, void *ctx,
int wpa_set_keys(struct vnt_private *pDevice, void *ctx,
bool fcpfkernel) __must_hold(&pDevice->lock)
{
struct viawget_wpa_param *param = ctx;
@ -412,7 +412,7 @@ int wpa_set_keys(PSDevice pDevice, void *ctx,
*
*/
static int wpa_set_wpa(PSDevice pDevice,
static int wpa_set_wpa(struct vnt_private *pDevice,
struct viawget_wpa_param *param)
{
PSMgmtObject pMgmt = pDevice->pMgmt;
@ -437,7 +437,7 @@ static int wpa_set_wpa(PSDevice pDevice,
*
*/
static int wpa_set_disassociate(PSDevice pDevice,
static int wpa_set_disassociate(struct vnt_private *pDevice,
struct viawget_wpa_param *param)
{
PSMgmtObject pMgmt = pDevice->pMgmt;
@ -466,7 +466,7 @@ static int wpa_set_disassociate(PSDevice pDevice,
*
*/
static int wpa_set_scan(PSDevice pDevice,
static int wpa_set_scan(struct vnt_private *pDevice,
struct viawget_wpa_param *param)
{
spin_lock_irq(&pDevice->lock);
@ -491,7 +491,7 @@ static int wpa_set_scan(PSDevice pDevice,
*
*/
static int wpa_get_bssid(PSDevice pDevice,
static int wpa_get_bssid(struct vnt_private *pDevice,
struct viawget_wpa_param *param)
{
PSMgmtObject pMgmt = pDevice->pMgmt;
@ -515,7 +515,7 @@ static int wpa_get_bssid(PSDevice pDevice,
*
*/
static int wpa_get_ssid(PSDevice pDevice,
static int wpa_get_ssid(struct vnt_private *pDevice,
struct viawget_wpa_param *param)
{
PSMgmtObject pMgmt = pDevice->pMgmt;
@ -543,7 +543,7 @@ static int wpa_get_ssid(PSDevice pDevice,
*
*/
static int wpa_get_scan(PSDevice pDevice,
static int wpa_get_scan(struct vnt_private *pDevice,
struct viawget_wpa_param *param)
{
struct viawget_scan_result *scan_buf;
@ -660,7 +660,7 @@ static int wpa_get_scan(PSDevice pDevice,
*
*/
static int wpa_set_associate(PSDevice pDevice,
static int wpa_set_associate(struct vnt_private *pDevice,
struct viawget_wpa_param *param)
{
PSMgmtObject pMgmt = pDevice->pMgmt;
@ -804,7 +804,7 @@ static int wpa_set_associate(PSDevice pDevice,
*
*/
int wpa_ioctl(PSDevice pDevice, struct iw_point *p)
int wpa_ioctl(struct vnt_private *pDevice, struct iw_point *p)
{
struct viawget_wpa_param *param;
int ret = 0;

6
drivers/staging/vt6655/wpactl.h
View File

@ -57,8 +57,8 @@ enum wpa_key_mgmt { KEY_MGMT_802_1X, KEY_MGMT_CCKM, KEY_MGMT_PSK, KEY_MGMT_NONE,
/*--------------------- Export Functions --------------------------*/
int wpa_set_wpadev(PSDevice pDevice, int val);
int wpa_ioctl(PSDevice pDevice, struct iw_point *p);
int wpa_set_keys(PSDevice pDevice, void *ctx, bool fcpfkernel);
int wpa_set_wpadev(struct vnt_private *, int val);
int wpa_ioctl(struct vnt_private *, struct iw_point *p);
int wpa_set_keys(struct vnt_private *, void *ctx, bool fcpfkernel);
#endif // __WPACL_H__

2
drivers/staging/vt6655/wroute.c
View File

@ -62,7 +62,7 @@ static int msglevel = MSG_LEVEL_INFO;
* Return Value: true if packet duplicate; otherwise false
*
*/
bool ROUTEbRelay(PSDevice pDevice, unsigned char *pbySkbData,
bool ROUTEbRelay(struct vnt_private *pDevice, unsigned char *pbySkbData,
unsigned int uDataLen, unsigned int uNodeIndex)
{
PSMgmtObject pMgmt = pDevice->pMgmt;

3
drivers/staging/vt6655/wroute.h
View File

@ -39,6 +39,7 @@
/*--------------------- Export Functions --------------------------*/
bool ROUTEbRelay(PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex);
bool ROUTEbRelay(struct vnt_private *pDevice, unsigned char *pbySkbData,
unsigned int uDataLen, unsigned int uNodeIndex);
#endif /* __WROUTE_H__ */