Commit a32fb5f7 authored by Moritz Muehlenhoff's avatar Moritz Muehlenhoff Committed by Greg Kroah-Hartman

Staging: wlan-ng: p80211netdev.h: Coding style cleanups

Signed-off-by: default avatarMoritz Muehlenhoff <jmm@debian.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c27f880c
...@@ -103,12 +103,8 @@ typedef struct net_device netdevice_t; ...@@ -103,12 +103,8 @@ typedef struct net_device netdevice_t;
#define P80211_NSDCAP_AUTOJOIN 0x100 /* nsd does autojoin */ #define P80211_NSDCAP_AUTOJOIN 0x100 /* nsd does autojoin */
#define P80211_NSDCAP_NOSCAN 0x200 /* nsd can scan */ #define P80211_NSDCAP_NOSCAN 0x200 /* nsd can scan */
/*================================================================*/
/* Types */
/* Received frame statistics */ /* Received frame statistics */
typedef struct p80211_frmrx_t typedef struct p80211_frmrx_t {
{
u32 mgmt; u32 mgmt;
u32 assocreq; u32 assocreq;
u32 assocresp; u32 assocresp;
...@@ -145,7 +141,7 @@ typedef struct p80211_frmrx_t ...@@ -145,7 +141,7 @@ typedef struct p80211_frmrx_t
} p80211_frmrx_t; } p80211_frmrx_t;
/* called by /proc/net/wireless */ /* called by /proc/net/wireless */
struct iw_statistics* p80211wext_get_wireless_stats(netdevice_t *dev); struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t * dev);
/* wireless extensions' ioctls */ /* wireless extensions' ioctls */
extern struct iw_handler_def p80211wext_handler_def; extern struct iw_handler_def p80211wext_handler_def;
int p80211wext_event_associated(struct wlandevice *wlandev, int assoc); int p80211wext_event_associated(struct wlandevice *wlandev, int assoc);
...@@ -164,13 +160,12 @@ extern int wlan_watchdog; ...@@ -164,13 +160,12 @@ extern int wlan_watchdog;
extern int wlan_wext_write; extern int wlan_wext_write;
/* WLAN device type */ /* WLAN device type */
typedef struct wlandevice typedef struct wlandevice {
{
struct wlandevice *next; /* link for list of devices */ struct wlandevice *next; /* link for list of devices */
void *priv; /* private data for MSD */ void *priv; /* private data for MSD */
/* Subsystem State */ /* Subsystem State */
char name[WLAN_DEVNAMELEN_MAX]; /* Dev name, from register_wlandev()*/ char name[WLAN_DEVNAMELEN_MAX]; /* Dev name, from register_wlandev() */
char *nsdname; char *nsdname;
u32 state; /* Device I/F state (open/closed) */ u32 state; /* Device I/F state (open/closed) */
...@@ -187,14 +182,16 @@ typedef struct wlandevice ...@@ -187,14 +182,16 @@ typedef struct wlandevice
unsigned int ethconv; unsigned int ethconv;
/* device methods (init by MSD, used by p80211 */ /* device methods (init by MSD, used by p80211 */
int (*open)(struct wlandevice *wlandev); int (*open) (struct wlandevice *wlandev);
int (*close)(struct wlandevice *wlandev); int (*close) (struct wlandevice *wlandev);
void (*reset)(struct wlandevice *wlandev ); void (*reset) (struct wlandevice *wlandev);
int (*txframe)(struct wlandevice *wlandev, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep); int (*txframe) (struct wlandevice *wlandev, struct sk_buff *skb,
int (*mlmerequest)(struct wlandevice *wlandev, p80211msg_t *msg); p80211_hdr_t *p80211_hdr,
int (*set_multicast_list)(struct wlandevice *wlandev, p80211_metawep_t *p80211_wep);
int (*mlmerequest) (struct wlandevice *wlandev, p80211msg_t *msg);
int (*set_multicast_list) (struct wlandevice *wlandev,
netdevice_t *dev); netdevice_t *dev);
void (*tx_timeout)(struct wlandevice *wlandev); void (*tx_timeout) (struct wlandevice *wlandev);
/* 802.11 State */ /* 802.11 State */
u8 bssid[WLAN_BSSID_LEN]; u8 bssid[WLAN_BSSID_LEN];
...@@ -233,9 +230,11 @@ typedef struct wlandevice ...@@ -233,9 +230,11 @@ typedef struct wlandevice
} wlandevice_t; } wlandevice_t;
/* WEP stuff */ /* WEP stuff */
int wep_change_key(wlandevice_t *wlandev, int keynum, u8* key, int keylen); int wep_change_key(wlandevice_t *wlandev, int keynum, u8 *key, int keylen);
int wep_decrypt(wlandevice_t *wlandev, u8 *buf, u32 len, int key_override, u8 *iv, u8 *icv); 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); u8 *iv, u8 *icv);
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);
int wlan_unsetup(wlandevice_t *wlandev); int wlan_unsetup(wlandevice_t *wlandev);
......
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