Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 00:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Moritz Muehlenhoff 2009-02-08 02:20:55 +01:00 committed by Greg Kroah-Hartman
parent d6c82d9719
commit c979aec791
1 changed files with 53 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/wlan-ng/p80211conv.h
View File

@ -53,9 +53,6 @@
#ifndef _LINUX_P80211CONV_H #ifndef _LINUX_P80211CONV_H
#define _LINUX_P80211CONV_H #define _LINUX_P80211CONV_H
/*================================================================*/
/* Constants */
#define WLAN_ETHADDR_LEN 6 #define WLAN_ETHADDR_LEN 6
#define WLAN_IEEE_OUI_LEN 3 #define WLAN_IEEE_OUI_LEN 3
@ -66,9 +63,6 @@
#define P80211CAPTURE_VERSION 0x80211001 #define P80211CAPTURE_VERSION 0x80211001
/*================================================================*/
/* Macros */
#define P80211_FRMMETA_MAGIC 0x802110 #define P80211_FRMMETA_MAGIC 0x802110
#define P80211SKB_FRMMETA(s) \ #define P80211SKB_FRMMETA(s) \
@ -79,8 +73,7 @@
#define P80211SKB_RXMETA(s) \ #define P80211SKB_RXMETA(s) \
(P80211SKB_FRMMETA((s)) ? P80211SKB_FRMMETA((s))->rx : ((p80211_rxmeta_t *)(NULL))) (P80211SKB_FRMMETA((s)) ? P80211SKB_FRMMETA((s))->rx : ((p80211_rxmeta_t *)(NULL)))
typedef struct p80211_rxmeta typedef struct p80211_rxmeta {
{
struct wlandevice *wlandev; struct wlandevice *wlandev;
u64 mactime; /* Hi-rez MAC-supplied time value */ u64 mactime; /* Hi-rez MAC-supplied time value */
@ -96,8 +89,7 @@ typedef struct p80211_rxmeta
} p80211_rxmeta_t; } p80211_rxmeta_t;
typedef struct p80211_frmmeta typedef struct p80211_frmmeta {
{
unsigned int magic; unsigned int magic;
p80211_rxmeta_t *rx; p80211_rxmeta_t *rx;
} p80211_frmmeta_t; } p80211_frmmeta_t;
@ -106,14 +98,10 @@ void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb);
int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb); int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb);
void p80211skb_rxmeta_detach(struct sk_buff *skb); void p80211skb_rxmeta_detach(struct sk_buff *skb);
/*================================================================*/
/* Types */
/* /*
* Frame capture header. (See doc/capturefrm.txt) * Frame capture header. (See doc/capturefrm.txt)
*/ */
typedef struct p80211_caphdr typedef struct p80211_caphdr {
{
u32 version; u32 version;
u32 length; u32 length;
u64 mactime; u64 mactime;
@ -140,24 +128,21 @@ typedef struct p80211_metawep {
} p80211_metawep_t; } p80211_metawep_t;
/* local ether header type */ /* local ether header type */
typedef struct wlan_ethhdr typedef struct wlan_ethhdr {
{
u8 daddr[WLAN_ETHADDR_LEN]; u8 daddr[WLAN_ETHADDR_LEN];
u8 saddr[WLAN_ETHADDR_LEN]; u8 saddr[WLAN_ETHADDR_LEN];
u16 type; u16 type;
} __attribute__ ((packed)) wlan_ethhdr_t; } __attribute__ ((packed)) wlan_ethhdr_t;
/* local llc header type */ /* local llc header type */
typedef struct wlan_llc typedef struct wlan_llc {
{
u8 dsap; u8 dsap;
u8 ssap; u8 ssap;
u8 ctl; u8 ctl;
} __attribute__ ((packed)) wlan_llc_t; } __attribute__ ((packed)) wlan_llc_t;
/* local snap header type */ /* local snap header type */
typedef struct wlan_snap typedef struct wlan_snap {
{
u8 oui[WLAN_IEEE_OUI_LEN]; u8 oui[WLAN_IEEE_OUI_LEN];
u16 type; u16 type;
} __attribute__ ((packed)) wlan_snap_t; } __attribute__ ((packed)) wlan_snap_t;
@ -165,9 +150,6 @@ typedef struct wlan_snap
/* Circular include trick */ /* Circular include trick */
struct wlandevice; struct wlandevice;
/*================================================================*/
/*Function Declarations */
int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv, int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,
struct sk_buff *skb); struct sk_buff *skb);
int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv, int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv,