diff options
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_internal.h')
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_internal.h | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/drivers/staging/wlags49_h2/wl_internal.h b/drivers/staging/wlags49_h2/wl_internal.h index cd129b3..5753408 100644 --- a/drivers/staging/wlags49_h2/wl_internal.h +++ b/drivers/staging/wlags49_h2/wl_internal.h @@ -67,7 +67,6 @@ /******************************************************************************* * include files ******************************************************************************/ -#include <linux/version.h> #ifdef BUS_PCMCIA #include <pcmcia/cistpl.h> #include <pcmcia/cisreg.h> @@ -75,15 +74,8 @@ #include <pcmcia/ds.h> #endif // BUS_PCMCIA -#ifdef HAS_WIRELESS_EXTENSIONS #include <linux/wireless.h> -#if WIRELESS_EXT > 13 #include <net/iw_handler.h> -#endif // WIRELESS_EXT > 13 -#define USE_DBM -#define RETURN_CURRENT_NETWORKNAME -#define USE_FREQUENCY -#endif // HAS_WIRELESS_EXTENSIONS/ #include <linux/list.h> @@ -891,7 +883,7 @@ struct wl_private int is_registered; int is_handling_int; int firmware_present; - char sysfsCreated; + bool sysfsCreated; CFG_DRV_INFO_STRCT driverInfo; CFG_IDENTITY_STRCT driverIdentity; CFG_FW_IDENTITY_STRCT StationIdentity; @@ -988,16 +980,15 @@ struct wl_private #ifdef USE_WDS WVLAN_WDS_IF wds_port[NUM_WDS_PORTS]; #endif // USE_WDS + + /* Track whether the card is using WEP encryption or WPA + * so we know what to disable next time through. + * IW_ENCODE_ALG_NONE, IW_ENCODE_ALG_WEP, IW_ENCODE_ALG_TKIP + */ + int wext_enc; }; // wl_private -#ifdef HAVE_NETDEV_PRIV #define wl_priv(dev) ((struct wl_private *) netdev_priv(dev)) -#else -extern inline struct wl_private *wl_priv(struct net_device *dev) -{ - return dev->priv; -} -#endif /********************************************************************/ /* Locking and synchronization functions */ |