staging: vt6656: removed SndEvt_ToAPI definition
authorAndres More <more.andres@gmail.com>
Sat, 26 Jun 2010 17:08:04 +0000 (14:08 -0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 8 Jul 2010 20:02:04 +0000 (13:02 -0700)
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>
drivers/staging/vt6656/bssdb.c
drivers/staging/vt6656/device.h
drivers/staging/vt6656/ioctl.c
drivers/staging/vt6656/main_usb.c
drivers/staging/vt6656/wmgr.h

index be54553262626ff55aec171045134c542df62477..830dd23b9279de7e061793140fa5e1227e52f569 100644 (file)
@@ -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))
 {
@@ -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);
index 628a9694877489ec2fe9386e8bb31656cc6fa69d..8a91d9321a74d0e2567e7b5980fec0efb7fa5b4a 100644 (file)
@@ -71,9 +71,6 @@
 #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
@@ -81,7 +78,6 @@
 #define RT_WPACONNECTED_EVENT_FLAG             0x0104
 #define RT_DOWNDEV_EVENT_FLAG                        0x0105
 #define RT_RMMOD_EVENT_FLAG                              0x0106
-#endif
 
 //
 // device specific
index 7c32125fbd514c764ba5c3bb88a38c8a996a94b2..fc4554f2b420272b0e187bf6c436d459ee24b7bc 100644 (file)
@@ -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;
 
@@ -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?
 }
 
index 5dbd61d0c701973c5d901d7e4bee0b06835f948b..37bb5a04c8bd6316d114fffdf817ee4354ee6043 100644 (file)
@@ -813,7 +813,6 @@ 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));
@@ -821,7 +820,6 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
   wrqu.data.length =IFNAMSIZ;
   wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, pDevice->dev->name);
 }
-#endif
 
        return 0;
 
@@ -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;
@@ -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) {
@@ -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);
 
index 9aa9de399cbfdf1d27100f3c846c6b98f4d7c882..28f8ad421fde63641d7cbf69df691df1aa88b5c9 100644 (file)
@@ -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;