Skip to content

Commit

Permalink
staging: vt6656: removed SndEvt_ToAPI definition
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed Jul 8, 2010
1 parent feaf03d commit 5583dcf
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 18 deletions.
2 changes: 0 additions & 2 deletions drivers/staging/vt6656/bssdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,6 @@ if(pDevice->byReAssocCount > 0) {
pDevice->byReAssocCount = 0;
}

#ifdef SndEvt_ToAPI
if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
(pMgmt->eLastState==WMAC_STATE_ASSOC))
{
Expand All @@ -1015,7 +1014,6 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
}
pMgmt->eLastState = pMgmt->eCurrState ;
#endif

#ifdef Calcu_LinkQual
s_uCalculateLinkQual((void *)pDevice);
Expand Down
4 changes: 0 additions & 4 deletions drivers/staging/vt6656/device.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,13 @@
#define WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
#endif

//2007-0920-01<Add>by MikeLiu
#ifndef SndEvt_ToAPI
#define SndEvt_ToAPI
//please copy below macro to driver_event.c for API
#define RT_INSMOD_EVENT_FLAG 0x0101
#define RT_UPDEV_EVENT_FLAG 0x0102
#define RT_DISCONNECTED_EVENT_FLAG 0x0103
#define RT_WPACONNECTED_EVENT_FLAG 0x0104
#define RT_DOWNDEV_EVENT_FLAG 0x0105
#define RT_RMMOD_EVENT_FLAG 0x0106
#endif

//
// device specific
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/vt6656/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,6 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
//DavidWang

if(wpa_Result.authenticated==TRUE) {
#ifdef SndEvt_ToAPI
{
union iwreq_data wrqu;

Expand All @@ -687,7 +686,6 @@ if(wpa_Result.authenticated==TRUE) {
wrqu.data.length =pItemSSID->len;
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, pItemSSID->abySSID);
}
#endif
pDevice->fWPA_Authened = TRUE; //is successful peer to wpa_Result.authenticated?
}

Expand Down
8 changes: 0 additions & 8 deletions drivers/staging/vt6656/main_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -813,15 +813,13 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)

usb_device_reset(pDevice);

#ifdef SndEvt_ToAPI
{
union iwreq_data wrqu;
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.flags = RT_INSMOD_EVENT_FLAG;
wrqu.data.length =IFNAMSIZ;
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, pDevice->dev->name);
}
#endif

return 0;

Expand Down Expand Up @@ -1161,14 +1159,12 @@ static int device_open(struct net_device *dev) {
netif_stop_queue(pDevice->dev);
pDevice->flags |= DEVICE_FLAGS_OPENED;

#ifdef SndEvt_ToAPI
{
union iwreq_data wrqu;
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.flags = RT_UPDEV_EVENT_FLAG;
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
}
#endif

DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_open success.. \n");
return 0;
Expand Down Expand Up @@ -1200,14 +1196,12 @@ static int device_close(struct net_device *dev) {
if (pDevice == NULL)
return -ENODEV;

#ifdef SndEvt_ToAPI
{
union iwreq_data wrqu;
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.flags = RT_DOWNDEV_EVENT_FLAG;
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
}
#endif

//2007-1121-02<Add>by EinsnLiu
if (pDevice->bLinkPass) {
Expand Down Expand Up @@ -1283,14 +1277,12 @@ static void __devexit vt6656_disconnect(struct usb_interface *intf)
if (!device)
return;

#ifdef SndEvt_ToAPI
{
union iwreq_data req;
memset(&req, 0, sizeof(req));
req.data.flags = RT_RMMOD_EVENT_FLAG;
wireless_send_event(device->dev, IWEVCUSTOM, &req, NULL);
}
#endif

device_release_WPADEV(device);

Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/vt6656/wmgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,7 @@ typedef struct tagSMgmtObject
// Operation state variables
WMAC_CURRENT_MODE eCurrMode; // MAC current connection mode
WMAC_BSS_STATE eCurrState; // MAC current BSS state
#ifdef SndEvt_ToAPI
WMAC_BSS_STATE eLastState; // MAC last BSS state
#endif

PKnownBSS pCurrBSS;
BYTE byCSSGK;
Expand Down

0 comments on commit 5583dcf

Please sign in to comment.