diff options
| author |  Karl Relton <karllinuxtest.relton@ntlworld.com>
| 2010-06-03 23:04:06 +0100 |
|---|---|---|
| committer |  Greg Kroah-Hartman <gregkh@suse.de>
| 2010-06-18 15:22:55 -0700 |
| commit | cb3126e60ffc1b7658a6ff4f6874585098bf9887 (patch) | |
| tree | 41d38b199cf0c48607d379b36289c6799856bab2 /drivers/staging/wlan-ng/p80211netdev.h | |
| parent | Staging: cxt1e1: remove code guarded by GENERIC_HDLC_VERSION (diff) | |
| download | linux-cb3126e60ffc1b7658a6ff4f6874585098bf9887.tar.gz linux-cb3126e60ffc1b7658a6ff4f6874585098bf9887.tar.bz2 linux-cb3126e60ffc1b7658a6ff4f6874585098bf9887.zip | |
Staging: wlan-ng: Switch from wext to cfg80211
Switch driver over from wext to cfg80211 interface.
Some Notes:
- This patch moves the driver wholesale from wext to cfg80211. Wext
support is still provided through the cfg80211 provided wext
compatability layer.
- Currently only infrastructure mode is implemented. Ad hoc mode is not
yet implemented, but can be added.
- It does not support connecting to a specified bssid, instead roaming
is handled by the card itself. This matches the behaviour of the
existing driver.
- It has been tested using NetworkManager (via wpa_supplicant)
configured to use the wext compatability layer, and then again with the
native nl80211 layer.
Signed-off-by: Karl Relton <karllinuxtest.relton@ntlworld.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng/p80211netdev.h')
| -rw-r--r-- | drivers/staging/wlan-ng/p80211netdev.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h index 3c8c64800567..098ccf71e035 100644 --- a/drivers/staging/wlan-ng/p80211netdev.h +++ b/drivers/staging/wlan-ng/p80211netdev.h @@ -148,6 +148,7 @@ int p80211wext_event_associated(struct wlandevice *wlandev, int assoc); #define MAX_KEYLEN 32 #define HOSTWEP_DEFAULTKEY_MASK (BIT(1)|BIT(0)) +#define HOSTWEP_SHAREDKEY BIT(3) #define HOSTWEP_DECRYPT BIT(4) #define HOSTWEP_ENCRYPT BIT(5) #define HOSTWEP_PRIVACYINVOKED BIT(6) @@ -233,7 +234,7 @@ int wep_decrypt(wlandevice_t *wlandev, u8 *buf, u32 len, int key_override, int wep_encrypt(wlandevice_t *wlandev, u8 *buf, u8 *dst, u32 len, int keynum, u8 *iv, u8 *icv); -int wlan_setup(wlandevice_t *wlandev); +int wlan_setup(wlandevice_t *wlandev, struct device *physdev); int wlan_unsetup(wlandevice_t *wlandev); int register_wlandev(wlandevice_t *wlandev); int unregister_wlandev(wlandevice_t *wlandev); |