Commit 028a7b08 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Jeff Garzik

[wireless prism54] several minor updates

Here is the ChangeLog:

	* wireless/Kconfig: fix typos, add SMC2835W-V2
	* islpci_hotplug.c: new version 1.1, authors list, and
	module description updated appropriately
	* isl_ioctl.c, islpci_dev.c, 
	islpci_eth.c, islpci_hotplug.c, islpci_mgt.c: 
	s/ndev->priv/netdev_priv(ndev)/g
	* islpci_hotplug.c: Add PCI ID values for SMC2835W-V2 cardbus card
	Patch by Manuel Lauss <manuel.lauss@fh-hagenberg.at>
	* isl_38xx.[ch]: include firmware.h in header, remove
	declaration of headers in c file. Fix compiler warnings.
	* islpci_dev.c (islpci_alloc_memory),
	* islpci_eth.c (islpci_eth_cleanup_transmit, 
	islpci_eth_transmit, islpci_eth_receive): deal with skb stray 
	pointer, declare NULL.
	* isl_38xx.c: remove unecessary __KERNEL_SYSCALLS__ and
	re-ordered headers per vger.kernel.org - liking.
	* isl_ioctl.c, islpci_mgt.c: move from MODULE_PARAM to the new
	module_param, which is type-safe. Includes the new 
	<linux/moduleparam.h>.
	* isl_ioctl.c (prism54_[s|g]et_[maxframeburst|profile]): added.
	Not adding ioctls as ajfa is working on moving current private ioctls
	to subioctls.
	* isl_oid.h (dot11_[maxframeburst|preamblesettings|
	slotsettings|nonerpstatus|nonerpprotection]_t): added.
	Note: more ioctls can be added here, I believe problems
	with mixed modes can be pinpointed here, with these values.
parent 543b4e66
...@@ -307,18 +307,18 @@ config PCMCIA_WL3501 ...@@ -307,18 +307,18 @@ config PCMCIA_WL3501
It has basic support for Linux wireless extensions and initial It has basic support for Linux wireless extensions and initial
micro support for ethtool. micro support for ethtool.
comment "Prism GT/Duette 802.11(a/b/g) PCI/PCMCIA support" comment "Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support"
depends on NET_RADIO && PCI depends on NET_RADIO && PCI
config PRISM54 config PRISM54
tristate 'Intersil Prism GT/Duette/Indigo PCI/PCMCIA' tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus'
depends on PCI && NET_RADIO && EXPERIMENTAL && HOTPLUG depends on PCI && NET_RADIO && EXPERIMENTAL && HOTPLUG
select FW_LOADER select FW_LOADER
---help--- ---help---
Enable PCI and Cardbus support for the following chipset based cards: Enable PCI and Cardbus support for the following chipset based cards:
ISL3880 - Prism GT 802.11 b/g ISL3880 - Prism GT 802.11 b/g
ISL3877 - Prism Indigo 802.11 a ISL3877 - Prism Indigo 802.11 a
ISL3890 - Prism Duette 802.11 a/b/g ISL3890 - Prism Duette 802.11 a/b/g
For a complete list of supported cards visit <http://prism54.org>. For a complete list of supported cards visit <http://prism54.org>.
Here is the latest confirmed list of supported cards: Here is the latest confirmed list of supported cards:
...@@ -335,8 +335,9 @@ config PRISM54 ...@@ -335,8 +335,9 @@ config PRISM54
Peabird WLG-PCI PCI Card Peabird WLG-PCI PCI Card
Sitecom WL-100i Cardbus Card Sitecom WL-100i Cardbus Card
Sitecom WL-110i PCI Card Sitecom WL-110i PCI Card
SMC2802W - EZ Connect g 2.4GHz 54 Mbps Wireless PCI Card SMC2802W - EZ Connect g 2.4GHz 54 Mbps Wireless PCI Card
SMC2835W - EZ Connect g 2.4GHz 54 Mbps Wireless Cardbus Card SMC2835W - EZ Connect g 2.4GHz 54 Mbps Wireless Cardbus Card
SMC2835W-V2 - EZ Connect g 2.4GHz 54 Mbps Wireless Cardbus Card
Z-Com XG-900 PCI Card Z-Com XG-900 PCI Card
Zyxel G-100 Cardbus Card Zyxel G-100 Cardbus Card
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/moduleparam.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -44,26 +45,26 @@ static int init_dot1x = CARD_DEFAULT_DOT1X; ...@@ -44,26 +45,26 @@ static int init_dot1x = CARD_DEFAULT_DOT1X;
static int init_conformance = CARD_DEFAULT_CONFORMANCE; static int init_conformance = CARD_DEFAULT_CONFORMANCE;
static int init_mlme = CARD_DEFAULT_MLME_MODE; static int init_mlme = CARD_DEFAULT_MLME_MODE;
MODULE_PARM(init_mode, "i"); module_param(init_mode, int, 0);
MODULE_PARM_DESC(init_mode, MODULE_PARM_DESC(init_mode,
"Set card mode:\n0: Auto\n1: Ad-Hoc\n2: Managed Client (Default)\n3: Master / Access Point\n4: Repeater (Not supported yet)\n5: Secondary (Not supported yet)\n6: Monitor"); "Set card mode:\n0: Auto\n1: Ad-Hoc\n2: Managed Client (Default)\n3: Master / Access Point\n4: Repeater (Not supported yet)\n5: Secondary (Not supported yet)\n6: Monitor");
MODULE_PARM(init_channel, "i"); module_param(init_channel, int, 0);
MODULE_PARM_DESC(init_channel, MODULE_PARM_DESC(init_channel,
"Check `iwpriv ethx channel` for available channels"); "Check `iwpriv ethx channel` for available channels");
MODULE_PARM(init_wep, "i"); module_param(init_wep, int, 0);
MODULE_PARM(init_filter, "i"); module_param(init_filter, int, 0);
MODULE_PARM(init_authen, "i"); module_param(init_authen, int, 0);
MODULE_PARM_DESC(init_authen, MODULE_PARM_DESC(init_authen,
"Authentication method. Can be of seven types:\n0 0x0000: None\n1 0x0001: DOT11_AUTH_OS (Default)\n2 0x0002: DOT11_AUTH_SK\n3 0x0003: DOT11_AUTH_BOTH"); "Authentication method. Can be of seven types:\n0 0x0000: None\n1 0x0001: DOT11_AUTH_OS (Default)\n2 0x0002: DOT11_AUTH_SK\n3 0x0003: DOT11_AUTH_BOTH");
MODULE_PARM(init_dot1x, "i"); module_param(init_dot1x, int, 0);
MODULE_PARM_DESC(init_dot1x, MODULE_PARM_DESC(init_dot1x,
"\n0: None/not set (Default)\n1: DOT11_DOT1X_AUTHENABLED\n2: DOT11_DOT1X_KEYTXENABLED"); "\n0: None/not set (Default)\n1: DOT11_DOT1X_AUTHENABLED\n2: DOT11_DOT1X_KEYTXENABLED");
MODULE_PARM(init_mlme, "i"); module_param(init_mlme, int, 0);
MODULE_PARM_DESC(init_mlme, MODULE_PARM_DESC(init_mlme,
"Sets the MAC layer management entity (MLME) mode of operation,\n0: DOT11_MLME_AUTO (Default)\n1: DOT11_MLME_INTERMEDIATE\n2: DOT11_MLME_EXTENDED"); "Sets the MAC layer management entity (MLME) mode of operation,\n0: DOT11_MLME_AUTO (Default)\n1: DOT11_MLME_INTERMEDIATE\n2: DOT11_MLME_EXTENDED");
...@@ -1944,16 +1945,70 @@ int ...@@ -1944,16 +1945,70 @@ int
prism54_get_wpa(struct net_device *ndev, struct iw_request_info *info, prism54_get_wpa(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
*uwrq = priv->wpa; *uwrq = priv->wpa;
return 0; return 0;
} }
int
prism54_set_maxframeburst(struct net_device *ndev, struct iw_request_info *info,
__u32 *uwrq, char *extra)
{
islpci_private *priv = netdev_priv(ndev);
u32 max_burst;
max_burst = (*uwrq) ? *uwrq : CARD_DEFAULT_MAXFRAMEBURST;
mgt_set_request(priv, DOT11_OID_MAXFRAMEBURST, 0, &max_burst);
return -EINPROGRESS; /* Call commit handler */
}
int
prism54_get_maxframeburst(struct net_device *ndev, struct iw_request_info *info,
__u32 *uwrq, char *extra)
{
islpci_private *priv = netdev_priv(ndev);
union oid_res_t r;
int rvalue;
rvalue = mgt_get_request(priv, DOT11_OID_MAXFRAMEBURST, 0, NULL, &r);
*uwrq = r.u;
return rvalue;
}
int
prism54_set_profile(struct net_device *ndev, struct iw_request_info *info,
__u32 *uwrq, char *extra)
{
islpci_private *priv = netdev_priv(ndev);
u32 profile;
profile = (*uwrq) ? *uwrq : CARD_DEFAULT_PROFILE;
mgt_set_request(priv, DOT11_OID_PROFILES, 0, &profile);
return -EINPROGRESS; /* Call commit handler */
}
int
prism54_get_profile(struct net_device *ndev, struct iw_request_info *info,
__u32 *uwrq, char *extra)
{
islpci_private *priv = netdev_priv(ndev);
union oid_res_t r;
int rvalue;
rvalue = mgt_get_request(priv, DOT11_OID_PROFILES, 0, NULL, &r);
*uwrq = r.u;
return rvalue;
}
int int
prism54_oid(struct net_device *ndev, struct iw_request_info *info, prism54_oid(struct net_device *ndev, struct iw_request_info *info,
__u32 *uwrq, char *extra) __u32 *uwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
priv->priv_oid = *uwrq; priv->priv_oid = *uwrq;
printk("%s: oid 0x%08X\n", ndev->name, *uwrq); printk("%s: oid 0x%08X\n", ndev->name, *uwrq);
......
/* /*
* $Id: isl_oid.h,v 1.2 2004/01/30 16:24:00 ajfa Exp $ * $Id: isl_oid.h,v 1.3 2004/03/09 09:05:27 mcgrof Exp $
* *
* Copyright (C) 2003 Herbert Valerio Riedel <hvr@gnu.org> * Copyright (C) 2003 Herbert Valerio Riedel <hvr@gnu.org>
* Copyright (C) 2004 Luis R. Rodriguez <mcgrof@ruslug.rutgers.edu>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -142,15 +143,131 @@ enum dot11_priv_t { ...@@ -142,15 +143,131 @@ enum dot11_priv_t {
DOT11_PRIV_TKIP = 1 DOT11_PRIV_TKIP = 1
}; };
/* Prism "Nitro" / Frameburst / "Packet Frame Grouping"
* Value is in microseconds. Represents the # microseconds
* the firmware will take to group frames before sending out then out
* together with a CSMA contention. Without this all frames are
* sent with a CSMA contention.
* Bibliography:
* http://www.hpl.hp.com/personal/Jean_Tourrilhes/Papers/Packet.Frame.Grouping.html
*/
enum dot11_maxframeburst_t {
/* Values for DOT11_OID_MAXFRAMEBURST */
DOT11_MAXFRAMEBURST_OFF = 0, /* Card firmware default */
DOT11_MAXFRAMEBURST_MIXED_SAFE = 650, /* 802.11 a,b,g safe */
DOT11_MAXFRAMEBURST_IDEAL = 1300, /* Theoretical ideal level */
DOT11_MAXFRAMEBURST_MAX = 5000, /* Use this as max,
* Note: firmware allows for greater values. This is a
* recommended max. I'll update this as I find
* out what the real MAX is. Also note that you don't necessarily
* get better results with a greater value here.
*/
};
/* Support for 802.11 long and short frame preambles.
* Long preamble uses 128-bit sync field, 8-bit CRC
* Short preamble uses 56-bit sync field, 16-bit CRC
*
* 802.11a -- not sure, both optionally ?
* 802.11b supports long and optionally short
* 802.11g supports both */
enum dot11_preamblesettings_t {
DOT11_PREAMBLESETTING_LONG = 0,
/* Allows *only* long 802.11 preambles */
DOT11_PREAMBLESETTING_SHORT = 1,
/* Allows *only* short 802.11 preambles */
DOT11_PREAMBLESETTING_DYNAMIC = 2
/* AutomatiGically set */
};
/* Support for 802.11 slot timing (time between packets).
*
* Long uses 802.11a slot timing (9 usec ?)
* Short uses 802.11b slot timing (20 use ?) */
enum dot11_slotsettings_t {
DOT11_SLOTSETTINGS_LONG = 0,
/* Allows *only* long 802.11b slot timing */
DOT11_SLOTSETTINGS_SHORT = 1,
/* Allows *only* long 802.11a slot timing */
DOT11_SLOTSETTINGS_DYNAMIC = 2
/* AutomatiGically set */
};
/* All you need to know, ERP is "Extended Rate PHY".
* An Extended Rate PHY (ERP) STA or AP shall support three different
* preamble and header formats:
* Long preamble (refer to above)
* Short preamble (refer to above)
* OFDM preamble ( ? )
*
* I'm assuming here Protection tells the AP
* to be careful, a STA which cannot handle the long pre-amble
* has joined.
*/
enum do11_nonerpstatus_t {
DOT11_ERPSTAT_NONEPRESENT = 0,
DOT11_ERPSTAT_USEPROTECTION = 1
};
/* (ERP is "Extended Rate PHY") Way to read NONERP is NON-ERP-*
* The key here is DOT11 NON ERP NEVER protects against
* NON ERP STA's. You *don't* want this unless
* you know what you are doing. It means you will only
* get Extended Rate capabilities */
enum dot11_nonerpprotection_t {
DOT11_NONERP_NEVER = 0,
DOT11_NONERP_ALWAYS = 1,
DOT11_NONERP_DYNAMIC = 2
};
/* Preset OID configuration for 802.11 modes
* Note: DOT11_OID_CW[MIN|MAX] hold the values of the
* DCS MIN|MAX backoff used */
enum dot11_profile_t { /* And set/allowed values */
/* Allowed values for DOT11_OID_PROFILES */
DOT11_PROFILE_B_ONLY = 0,
/* DOT11_OID_RATES: 1, 2, 5.5, 11Mbps
* DOT11_OID_PREAMBLESETTINGS: DOT11_PREAMBLESETTING_DYNAMIC
* DOT11_OID_CWMIN: 31
* DOT11_OID_NONEPROTECTION: DOT11_NOERP_DYNAMIC
* DOT11_OID_SLOTSETTINGS: DOT11_SLOTSETTINGS_LONG
*/
DOT11_PROFILE_MIXED_G_WIFI = 1,
/* DOT11_OID_RATES: 1, 2, 5.5, 11, 6, 9, 12, 18, 24, 36, 48, 54Mbs
* DOT11_OID_PREAMBLESETTINGS: DOT11_PREAMBLESETTING_DYNAMIC
* DOT11_OID_CWMIN: 15
* DOT11_OID_NONEPROTECTION: DOT11_NOERP_DYNAMIC
* DOT11_OID_SLOTSETTINGS: DOT11_SLOTSETTINGS_DYNAMIC
*/
DOT11_PROFILE_MIXED_LONG = 2, /* "Long range" */
/* Same as Profile MIXED_G_WIFI */
DOT11_PROFILE_G_ONLY = 3,
/* Same as Profile MIXED_G_WIFI */
DOT11_PROFILE_TEST = 4,
/* Same as Profile MIXED_G_WIFI except:
* DOT11_OID_PREAMBLESETTINGS: DOT11_PREAMBLESETTING_SHORT
* DOT11_OID_NONEPROTECTION: DOT11_NOERP_NEVER
* DOT11_OID_SLOTSETTINGS: DOT11_SLOTSETTINGS_SHORT
*/
DOT11_PROFILE_B_WIFI = 5,
/* Same as Profile B_ONLY */
DOT11_PROFILE_A_ONLY = 6,
/* Same as Profile MIXED_G_WIFI except:
* DOT11_OID_RATES: 6, 9, 12, 18, 24, 36, 48, 54Mbs
*/
DOT11_PROFILE_MIXED_SHORT = 7
/* Same as MIXED_G_WIFI */
};
/* The dot11d conformance level configures the 802.11d conformance levels. /* The dot11d conformance level configures the 802.11d conformance levels.
* The following conformance levels exist:*/ * The following conformance levels exist:*/
enum oid_inl_conformance_t { enum oid_inl_conformance_t {
OID_INL_CONFORMANCE_NONE = 0, /* Perform active scanning */ OID_INL_CONFORMANCE_NONE = 0, /* Perform active scanning */
OID_INL_CONFORMANCE_STRICT = 1, /* Strictly adhere to 802.11d */ OID_INL_CONFORMANCE_STRICT = 1, /* Strictly adhere to 802.11d */
OID_INL_CONFORMANCE_FLEXIBLE = 2, /* Use passed 802.11d info to OID_INL_CONFORMANCE_FLEXIBLE = 2, /* Use passed 802.11d info to
* determine channel AND/OR just make * determine channel AND/OR just make assumption that active
* assumption that active * channels are valid channels */
* channels are valid channels */
}; };
enum oid_inl_mode_t { enum oid_inl_mode_t {
...@@ -176,6 +293,7 @@ enum oid_inl_phycap_t { ...@@ -176,6 +293,7 @@ enum oid_inl_phycap_t {
INL_PHYCAP_FAA = 0x80000000, /* Means card supports the FAA switch */ INL_PHYCAP_FAA = 0x80000000, /* Means card supports the FAA switch */
}; };
enum oid_num_t { enum oid_num_t {
GEN_OID_MACADDRESS = 0, GEN_OID_MACADDRESS = 0,
GEN_OID_LINKSTATE, GEN_OID_LINKSTATE,
...@@ -269,8 +387,8 @@ enum oid_num_t { ...@@ -269,8 +387,8 @@ enum oid_num_t {
DOT11_OID_FRAMEABORTSPHY, DOT11_OID_FRAMEABORTSPHY,
DOT11_OID_SLOTTIME, DOT11_OID_SLOTTIME,
DOT11_OID_CWMIN, DOT11_OID_CWMIN, /* MIN DCS backoff */
DOT11_OID_CWMAX, DOT11_OID_CWMAX, /* MAX DCS backoff */
DOT11_OID_ACKWINDOW, DOT11_OID_ACKWINDOW,
DOT11_OID_ANTENNARX, DOT11_OID_ANTENNARX,
DOT11_OID_ANTENNATX, DOT11_OID_ANTENNATX,
......
...@@ -63,6 +63,7 @@ islpci_eth_cleanup_transmit(islpci_private *priv, ...@@ -63,6 +63,7 @@ islpci_eth_cleanup_transmit(islpci_private *priv,
priv->pci_map_tx_address[index], priv->pci_map_tx_address[index],
skb->len, PCI_DMA_TODEVICE); skb->len, PCI_DMA_TODEVICE);
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
skb = NULL;
} }
/* increment the free data low queue pointer */ /* increment the free data low queue pointer */
priv->free_data_tx++; priv->free_data_tx++;
...@@ -238,6 +239,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev) ...@@ -238,6 +239,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
drop_free: drop_free:
/* free the skbuf structure before aborting */ /* free the skbuf structure before aborting */
dev_kfree_skb(skb); dev_kfree_skb(skb);
skb = NULL;
priv->statistics.tx_dropped++; priv->statistics.tx_dropped++;
spin_unlock_irqrestore(&priv->slock, flags); spin_unlock_irqrestore(&priv->slock, flags);
...@@ -346,8 +348,10 @@ islpci_eth_receive(islpci_private *priv) ...@@ -346,8 +348,10 @@ islpci_eth_receive(islpci_private *priv)
skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[0], skb->data[1], skb->data[2], skb->data[3],
skb->data[4], skb->data[5]); skb->data[4], skb->data[5]);
#endif #endif
if (discard) if (discard) {
dev_kfree_skb(skb); dev_kfree_skb(skb);
skb = NULL;
}
else else
netif_rx(skb); netif_rx(skb);
...@@ -388,6 +392,7 @@ islpci_eth_receive(islpci_private *priv) ...@@ -388,6 +392,7 @@ islpci_eth_receive(islpci_private *priv)
/* free the skbuf structure before aborting */ /* free the skbuf structure before aborting */
dev_kfree_skb((struct sk_buff *) skb); dev_kfree_skb((struct sk_buff *) skb);
skb = NULL;
break; break;
} }
/* update the fragment address */ /* update the fragment address */
......
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
#include "isl_oid.h" #include "isl_oid.h"
#define DRV_NAME "prism54" #define DRV_NAME "prism54"
#define DRV_VERSION "1.0.2.2" #define DRV_VERSION "1.1"
MODULE_AUTHOR("W.Termorshuizen, R.Bastings, H.V.Riedel, prism54.org team"); MODULE_AUTHOR("[Intersil] R.Bastings and W.Termorshuizen, The prism54.org Development Team <prism54-devel@prism54.org>");
MODULE_DESCRIPTION("Intersil 802.11 Wireless LAN adapter"); MODULE_DESCRIPTION("The Prism54 802.11 Wireless LAN adapter");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
/* In this order: vendor, device, subvendor, subdevice, class, class_mask, /* In this order: vendor, device, subvendor, subdevice, class, class_mask,
...@@ -96,6 +96,11 @@ static const struct pci_device_id prism54_id_tbl[] = { ...@@ -96,6 +96,11 @@ static const struct pci_device_id prism54_id_tbl[] = {
PCIVENDOR_ACCTON, 0xee03UL, PCIVENDOR_ACCTON, 0xee03UL,
0, 0, 0, 0,
(unsigned long) "SMC 2802Wv2"}, (unsigned long) "SMC 2802Wv2"},
{
PCIVENDOR_INTERSIL, PCIDEVICE_ISL3890,
PCIVENDOR_SMC, 0xa835UL,
0, 0,
(unsigned long) "SMC 2835Wv2"},
{ {
PCIVENDOR_INTERSIL, PCIDEVICE_ISL3877, PCIVENDOR_INTERSIL, PCIDEVICE_ISL3877,
PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
...@@ -159,6 +164,9 @@ prism54_get_card_model(struct net_device *ndev) ...@@ -159,6 +164,9 @@ prism54_get_card_model(struct net_device *ndev)
case 0x2835UL: case 0x2835UL:
modelp = "SMC2835W"; modelp = "SMC2835W";
break; break;
case 0xa835UL:
modelp = "SMC2835W V2";
break;
/* Let's leave this one out for now since it seems bogus/wrong /* Let's leave this one out for now since it seems bogus/wrong
* Even if the manufacturer did use 0x0000UL it may not be correct * Even if the manufacturer did use 0x0000UL it may not be correct
* by their part, therefore deserving no name ;) */ * by their part, therefore deserving no name ;) */
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/moduleparam.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/system.h> #include <asm/system.h>
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
Global variable definition section Global variable definition section
******************************************************************************/ ******************************************************************************/
int pc_debug = VERBOSE; int pc_debug = VERBOSE;
MODULE_PARM(pc_debug, "i"); module_param(pc_debug, int, 0);
/****************************************************************************** /******************************************************************************
Driver general functions Driver general functions
......
...@@ -87,11 +87,13 @@ static const int init_wds = 0; /* help compiler optimize away dead code */ ...@@ -87,11 +87,13 @@ static const int init_wds = 0; /* help compiler optimize away dead code */
#define CARD_DEFAULT_KEY4 "default_key_4" #define CARD_DEFAULT_KEY4 "default_key_4"
#define CARD_DEFAULT_WEP 0 #define CARD_DEFAULT_WEP 0
#define CARD_DEFAULT_FILTER 0 #define CARD_DEFAULT_FILTER 0
# define CARD_DEFAULT_WDS 0 #define CARD_DEFAULT_WDS 0
#define CARD_DEFAULT_AUTHEN DOT11_AUTH_OS #define CARD_DEFAULT_AUTHEN DOT11_AUTH_OS
#define CARD_DEFAULT_DOT1X 0 #define CARD_DEFAULT_DOT1X 0
#define CARD_DEFAULT_MLME_MODE DOT11_MLME_AUTO #define CARD_DEFAULT_MLME_MODE DOT11_MLME_AUTO
#define CARD_DEFAULT_CONFORMANCE OID_INL_CONFORMANCE_NONE #define CARD_DEFAULT_CONFORMANCE OID_INL_CONFORMANCE_NONE
#define CARD_DEFAULT_PROFILE DOT11_PROFILE_MIXED_G_WIFI
#define CARD_DEFAULT_MAXFRAMEBURST DOT11_MAXFRAMEBURST_MIXED_SAFE
/* PIMFOR package definitions */ /* PIMFOR package definitions */
#define PIMFOR_ETHERTYPE 0x8828 #define PIMFOR_ETHERTYPE 0x8828
......
...@@ -97,7 +97,7 @@ struct oid_t isl_oid[] = { ...@@ -97,7 +97,7 @@ struct oid_t isl_oid[] = {
[DOT11_OID_ALOFT_CONFIG] = OID_UNKNOWN(0x1d000006), [DOT11_OID_ALOFT_CONFIG] = OID_UNKNOWN(0x1d000006),
[DOT11_OID_VDCFX] = {0x1b000000, 7, 0, 0}, [DOT11_OID_VDCFX] = {0x1b000000, 7, 0, 0},
[DOT11_OID_MAXFRAMEBURST] = OID_U32(0x1b000008), [DOT11_OID_MAXFRAMEBURST] = OID_U32(0x1b000008), /* in microseconds */
[DOT11_OID_PSM] = OID_U32(0x14000000), [DOT11_OID_PSM] = OID_U32(0x14000000),
[DOT11_OID_CAMTIMEOUT] = OID_U32(0x14000001), [DOT11_OID_CAMTIMEOUT] = OID_U32(0x14000001),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment