microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

staging: vt6656: removed SndEvt_ToAPI definition 

Removed an always defined macro, perhaps used to patch the driver

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andres More 2010-06-26 14:08:04 -03:00 коммит произвёл Greg Kroah-Hartman
Родитель feaf03d3b4
Коммит 5583dcf587
5 изменённых файлов: 0 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
drivers/staging/vt6656/bssdb.c
Просмотреть файл

@ -1005,7 +1005,6 @@ if(pDevice->byReAssocCount > 0) {
pDevice->byReAssocCount = 0; pDevice->byReAssocCount = 0;
} }
#ifdef SndEvt_ToAPI
if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) && if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
(pMgmt->eLastState==WMAC_STATE_ASSOC)) (pMgmt->eLastState==WMAC_STATE_ASSOC))
{ {
@ -1015,7 +1014,6 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL); wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
} }
pMgmt->eLastState = pMgmt->eCurrState ; pMgmt->eLastState = pMgmt->eCurrState ;
#endif
#ifdef Calcu_LinkQual #ifdef Calcu_LinkQual
s_uCalculateLinkQual((void *)pDevice); s_uCalculateLinkQual((void *)pDevice);

4
drivers/staging/vt6656/device.h
Просмотреть файл

@ -71,9 +71,6 @@
#define WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #define WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
#endif #endif
//2007-0920-01<Add>by MikeLiu
#ifndef SndEvt_ToAPI
#define SndEvt_ToAPI
//please copy below macro to driver_event.c for API //please copy below macro to driver_event.c for API
#define RT_INSMOD_EVENT_FLAG 0x0101 #define RT_INSMOD_EVENT_FLAG 0x0101
#define RT_UPDEV_EVENT_FLAG 0x0102 #define RT_UPDEV_EVENT_FLAG 0x0102
@ -81,7 +78,6 @@
#define RT_WPACONNECTED_EVENT_FLAG 0x0104 #define RT_WPACONNECTED_EVENT_FLAG 0x0104
#define RT_DOWNDEV_EVENT_FLAG 0x0105 #define RT_DOWNDEV_EVENT_FLAG 0x0105
#define RT_RMMOD_EVENT_FLAG 0x0106 #define RT_RMMOD_EVENT_FLAG 0x0106
#endif
// //
// device specific // device specific

2
drivers/staging/vt6656/ioctl.c
Просмотреть файл

@ -676,7 +676,6 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
//DavidWang //DavidWang
if(wpa_Result.authenticated==TRUE) { if(wpa_Result.authenticated==TRUE) {
#ifdef SndEvt_ToAPI
{ {
union iwreq_data wrqu; union iwreq_data wrqu;
@ -687,7 +686,6 @@ if(wpa_Result.authenticated==TRUE) {
wrqu.data.length =pItemSSID->len; wrqu.data.length =pItemSSID->len;
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, pItemSSID->abySSID); wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, pItemSSID->abySSID);
} }
#endif
pDevice->fWPA_Authened = TRUE; //is successful peer to wpa_Result.authenticated? pDevice->fWPA_Authened = TRUE; //is successful peer to wpa_Result.authenticated?
} }

8
drivers/staging/vt6656/main_usb.c
Просмотреть файл

@ -813,7 +813,6 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
usb_device_reset(pDevice); usb_device_reset(pDevice);
#ifdef SndEvt_ToAPI
{ {
union iwreq_data wrqu; union iwreq_data wrqu;
memset(&wrqu, 0, sizeof(wrqu)); memset(&wrqu, 0, sizeof(wrqu));
@ -821,7 +820,6 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
wrqu.data.length =IFNAMSIZ; wrqu.data.length =IFNAMSIZ;
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, pDevice->dev->name); wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, pDevice->dev->name);
} }
#endif
return 0; return 0;
@ -1161,14 +1159,12 @@ static int device_open(struct net_device *dev) {
netif_stop_queue(pDevice->dev); netif_stop_queue(pDevice->dev);
pDevice->flags |= DEVICE_FLAGS_OPENED; pDevice->flags |= DEVICE_FLAGS_OPENED;
#ifdef SndEvt_ToAPI
{ {
union iwreq_data wrqu; union iwreq_data wrqu;
memset(&wrqu, 0, sizeof(wrqu)); memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.flags = RT_UPDEV_EVENT_FLAG; wrqu.data.flags = RT_UPDEV_EVENT_FLAG;
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL); wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
} }
#endif
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_open success.. \n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_open success.. \n");
return 0; return 0;
@ -1200,14 +1196,12 @@ static int device_close(struct net_device *dev) {
if (pDevice == NULL) if (pDevice == NULL)
return -ENODEV; return -ENODEV;
#ifdef SndEvt_ToAPI
{ {
union iwreq_data wrqu; union iwreq_data wrqu;
memset(&wrqu, 0, sizeof(wrqu)); memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.flags = RT_DOWNDEV_EVENT_FLAG; wrqu.data.flags = RT_DOWNDEV_EVENT_FLAG;
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL); wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
} }
#endif
//2007-1121-02<Add>by EinsnLiu //2007-1121-02<Add>by EinsnLiu
if (pDevice->bLinkPass) { if (pDevice->bLinkPass) {
@ -1283,14 +1277,12 @@ static void __devexit vt6656_disconnect(struct usb_interface *intf)
if (!device) if (!device)
return; return;
#ifdef SndEvt_ToAPI
{ {
union iwreq_data req; union iwreq_data req;
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
req.data.flags = RT_RMMOD_EVENT_FLAG; req.data.flags = RT_RMMOD_EVENT_FLAG;
wireless_send_event(device->dev, IWEVCUSTOM, &req, NULL); wireless_send_event(device->dev, IWEVCUSTOM, &req, NULL);
} }
#endif
device_release_WPADEV(device); device_release_WPADEV(device);

2
drivers/staging/vt6656/wmgr.h
Просмотреть файл

@ -259,9 +259,7 @@ typedef struct tagSMgmtObject
// Operation state variables // Operation state variables
WMAC_CURRENT_MODE eCurrMode; // MAC current connection mode WMAC_CURRENT_MODE eCurrMode; // MAC current connection mode
WMAC_BSS_STATE eCurrState; // MAC current BSS state WMAC_BSS_STATE eCurrState; // MAC current BSS state
#ifdef SndEvt_ToAPI
WMAC_BSS_STATE eLastState; // MAC last BSS state WMAC_BSS_STATE eLastState; // MAC last BSS state
#endif
PKnownBSS pCurrBSS; PKnownBSS pCurrBSS;
BYTE byCSSGK; BYTE byCSSGK;