Commit f1426fd7 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: Remove WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT macro 



Already removed in parts of driver.

Removed in remainder.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 70e22779

drivers/staging/vt6656/bssdb.c

+0 −6
Original line number Diff line number Diff line
@@ -913,7 +913,6 @@ if(pDevice->byReAssocCount > 0) { 
   if((pDevice->byReAssocCount > 10) && (pDevice->bLinkPass != TRUE)) {  //10 sec timeout

                     printk("Re-association timeout!!!\n");

		   pDevice->byReAssocCount = 0;

                     #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

                    // if(pDevice->bWPASuppWextEnabled == TRUE)

                        {

                  	union iwreq_data  wrqu;
@@ -922,7 +921,6 @@ if(pDevice->byReAssocCount > 0) { 
                  	PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");

                  	wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);

                       }

                    #endif

     }

   else if(pDevice->bLinkPass == TRUE)

   	pDevice->byReAssocCount = 0;
@@ -1116,7 +1114,6 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) && 
             netif_rx(pDevice->skb);

             pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);

         }

   #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

      {

	union iwreq_data  wrqu;

	memset(&wrqu, 0, sizeof (wrqu));
@@ -1124,7 +1121,6 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) && 
	PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");

	wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);

     }

  #endif

            }

        }

        else if (pItemSSID->len != 0) {
@@ -1169,11 +1165,9 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bIsRoaming %d, !\n", pDevice->bIsRoaming ); 
else {

            if (pDevice->uAutoReConnectTime < 10) {

                pDevice->uAutoReConnectTime++;

               #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

                //network manager support need not do Roaming scan???

                if(pDevice->bWPASuppWextEnabled ==TRUE)

		 pDevice->uAutoReConnectTime = 0;

	     #endif

            }

            else {

	    //mike use old encryption status for wpa reauthen

drivers/staging/vt6656/device.h

+0 −6
Original line number Diff line number Diff line
@@ -68,10 +68,6 @@ 
#include <linux/wireless.h>

#include <net/iw_handler.h>	// New driver API



#ifndef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

#define WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

#endif



//please copy below macro to driver_event.c for API

#define RT_INSMOD_EVENT_FLAG                             0x0101

#define RT_UPDEV_EVENT_FLAG                               0x0102
@@ -815,13 +811,11 @@ typedef struct __device_info { 
    struct sk_buff          *skb;

    //--



#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

        BOOL                 bwextstep0;

        BOOL                 bwextstep1;

        BOOL                 bwextstep2;

        BOOL                 bwextstep3;

        BOOL                 bWPASuppWextEnabled;

#endif



#ifdef HOSTAP

    // user space daemon: hostapd, is used for HOSTAP

drivers/staging/vt6656/dpc.c

+0 −2
Original line number Diff line number Diff line
@@ -864,7 +864,6 @@ RXbBulkInProcessData ( 
                            pDevice->dev->name);

                    }

                }

       #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

				//send event to wpa_supplicant

				//if(pDevice->bWPASuppWextEnabled == TRUE)

				{
@@ -889,7 +888,6 @@ RXbBulkInProcessData ( 
					wireless_send_event(pDevice->dev, IWEVMICHAELMICFAILURE, &wrqu, (char *)&ev);



				}

         #endif





                if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {

drivers/staging/vt6656/iwctl.c

+1 −17
Original line number Diff line number Diff line
@@ -38,19 +38,12 @@ 
#include "hostap.h"

#include "power.h"

#include "rf.h"



#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

#include "iowpa.h"

#include "wpactl.h"

#endif



#include <net/iw_handler.h>



#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

#define SUPPORTED_WIRELESS_EXT 18

#else

#define SUPPORTED_WIRELESS_EXT 17

#endif



static const long frequency_list[] = {

	2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484,
@@ -704,10 +697,8 @@ int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info, 
		memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);

		memset(pMgmt->abyDesireBSSID, 0xFF,6);

		PRINT_K("set essid to 'any' \n");

#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

		// Unknown desired AP, so here need not associate??

		return 0;

#endif

	} else {

		// Set the SSID

		memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
@@ -729,7 +720,6 @@ int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info, 
			return 0;

		}



#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

		// Wext wil order another command of siwap to link

		// with desired AP, so here need not associate??

		if (pDevice->bWPASuppWextEnabled == TRUE)  {
@@ -778,7 +768,6 @@ int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info, 
			}

			return 0;

		}

#endif



		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set essid = %s \n", pItemSSID->abySSID);

	}
@@ -1155,9 +1144,8 @@ int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info, 
		pMgmt->bShareKeyAlgorithm = FALSE;

	}



#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

	memset(pMgmt->abyDesireBSSID, 0xFF, 6);

#endif



	return rc;

}
@@ -1311,8 +1299,6 @@ int iwctl_giwsens(struct net_device *dev, struct iw_request_info *info, 
	return 0;

}



#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT



int iwctl_siwauth(struct net_device *dev, struct iw_request_info *info,

		struct iw_param *wrq, char *extra)

{
@@ -1627,8 +1613,6 @@ int iwctl_siwmlme(struct net_device *dev, struct iw_request_info *info, 
	return ret;

}



#endif



static const iw_handler iwctl_handler[] = {

	(iw_handler)NULL, // SIOCSIWCOMMIT

	(iw_handler)NULL, // SIOCGIWNAME

drivers/staging/vt6656/iwctl.h

+0 −2
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info, 
int iwctl_siwscan(struct net_device *dev, struct iw_request_info *info,

		struct iw_param *wrq, char *extra);



#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

int iwctl_siwauth(struct net_device *dev, struct iw_request_info *info,

		struct iw_param *wrq, char *extra);
@@ -139,7 +138,6 @@ int iwctl_giwencodeext(struct net_device *dev, struct iw_request_info *info, 


int iwctl_siwmlme(struct net_device *dev, struct iw_request_info *info,

		struct iw_point *wrq, char *extra);

#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT



extern const struct iw_handler_def iwctl_handler_def;

extern const struct iw_priv_args iwctl_private_args;