Staging: wlan-ng: fix style issues in p80211conv.h

This patch removes typedefs in p80211conv.h.

Signed-off-by: Edgardo Hames <ehames@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 20 insertions, 20 deletions

diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h
index 65ab2115df1..eca0391c676 100644
--- a/drivers/staging/wlan-ng/p80211conv.h
+++ b/drivers/staging/wlan-ng/p80211conv.h
@@ -63,17 +63,17 @@
 
 #define P80211CAPTURE_VERSION   0x80211001
 
-#define P80211_FRMMETA_MAGIC            0x802110
+#define P80211_FRMMETA_MAGIC    0x802110
 
 #define P80211SKB_FRMMETA(s) \
-        (((((p80211_frmmeta_t *)((s)->cb))->magic) == P80211_FRMMETA_MAGIC) ? \
-                ((p80211_frmmeta_t *)((s)->cb)) : \
+        (((((struct p80211_frmmeta *)((s)->cb))->magic) == P80211_FRMMETA_MAGIC) ? \
+                ((struct p80211_frmmeta *)((s)->cb)) : \
                 (NULL))
 
 #define P80211SKB_RXMETA(s) \
-        (P80211SKB_FRMMETA((s)) ?  P80211SKB_FRMMETA((s))->rx : ((p80211_rxmeta_t *)(NULL)))
+        (P80211SKB_FRMMETA((s)) ?  P80211SKB_FRMMETA((s))->rx : ((struct p80211_rxmeta *)(NULL)))
 
-typedef struct p80211_rxmeta {
+struct p80211_rxmeta {
         struct wlandevice *wlandev;
 
         u64 mactime;            /* Hi-rez MAC-supplied time value */
@@ -87,12 +87,12 @@ typedef struct p80211_rxmeta {
         unsigned int preamble;  /* P80211ENUM_preambletype_* */
         unsigned int encoding;  /* P80211ENUM_encoding_* */
 
-} p80211_rxmeta_t;
+};
 
-typedef struct p80211_frmmeta {
+struct p80211_frmmeta {
         unsigned int magic;
-        p80211_rxmeta_t *rx;
-} p80211_frmmeta_t;
+        struct p80211_rxmeta *rx;
+};
 
 void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb);
 int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb);
@@ -101,7 +101,7 @@ void p80211skb_rxmeta_detach(struct sk_buff *skb);
 /*
  * Frame capture header.  (See doc/capturefrm.txt)
  */
-typedef struct p80211_caphdr {
+struct p80211_caphdr {
         u32 version;
         u32 length;
         u64 mactime;
@@ -116,36 +116,36 @@ typedef struct p80211_caphdr {
         s32 ssi_noise;
         u32 preamble;
         u32 encoding;
-} p80211_caphdr_t;
+};
 
 /* buffer free method pointer type */
 typedef void (*freebuf_method_t) (void *buf, int size);
 
-typedef struct p80211_metawep {
+struct p80211_metawep {
         void *data;
         u8 iv[4];
         u8 icv[4];
-} p80211_metawep_t;
+};
 
 /* local ether header type */
-typedef struct wlan_ethhdr {
+struct wlan_ethhdr {
         u8 daddr[WLAN_ETHADDR_LEN];
         u8 saddr[WLAN_ETHADDR_LEN];
         u16 type;
-} __attribute__ ((packed)) wlan_ethhdr_t;
+} __attribute__ ((packed));
 
 /* local llc header type */
-typedef struct wlan_llc {
+struct wlan_llc {
         u8 dsap;
         u8 ssap;
         u8 ctl;
-} __attribute__ ((packed)) wlan_llc_t;
+} __attribute__ ((packed));
 
 /* local snap header type */
-typedef struct wlan_snap {
+struct wlan_snap {
         u8 oui[WLAN_IEEE_OUI_LEN];
         u16 type;
-} __attribute__ ((packed)) wlan_snap_t;
+} __attribute__ ((packed));
 
 /* Circular include trick */
 struct wlandevice;
@@ -154,7 +154,7 @@ int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,
                         struct sk_buff *skb);
 int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv,
                         struct sk_buff *skb, union p80211_hdr *p80211_hdr,
-                        p80211_metawep_t *p80211_wep);
+                        struct p80211_metawep *p80211_wep);
 
 int p80211_stt_findproto(u16 proto);