Staging: wlan-ng: p80211conv.h: Coding style cleanups (c979aec7) · Commits · 戴 / test

drivers/staging/wlan-ng/p80211conv.h

+53 −71

Original line number	Diff line number	Diff line
		@@ -53,9 +53,6 @@
		#ifndef _LINUX_P80211CONV_H
		#define _LINUX_P80211CONV_H

		/================================================================/
		/* Constants */

		#define WLAN_ETHADDR_LEN 6
		#define WLAN_IEEE_OUI_LEN 3

		@@ -66,9 +63,6 @@

		#define P80211CAPTURE_VERSION 0x80211001

		/================================================================/
		/* Macros */

		#define P80211_FRMMETA_MAGIC 0x802110

		#define P80211SKB_FRMMETA(s) \
		@@ -79,8 +73,7 @@
		#define P80211SKB_RXMETA(s) \
		(P80211SKB_FRMMETA((s)) ? P80211SKB_FRMMETA((s))->rx : ((p80211_rxmeta_t *)(NULL)))

		typedef struct p80211_rxmeta
		{
		typedef struct p80211_rxmeta {
		struct wlandevice *wlandev;

		u64 mactime; /* Hi-rez MAC-supplied time value */
		@@ -96,8 +89,7 @@ typedef struct p80211_rxmeta

		} p80211_rxmeta_t;

		typedef struct p80211_frmmeta
		{
		typedef struct p80211_frmmeta {
		unsigned int magic;
		p80211_rxmeta_t *rx;
		} 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);
		void p80211skb_rxmeta_detach(struct sk_buff *skb);

		/================================================================/
		/* Types */

		/*
		* Frame capture header. (See doc/capturefrm.txt)
		*/
		typedef struct p80211_caphdr
		{
		typedef struct p80211_caphdr {
		u32 version;
		u32 length;
		u64 mactime;
		@@ -140,24 +128,21 @@ typedef struct p80211_metawep {
		} p80211_metawep_t;

		/* local ether header type */
		typedef struct wlan_ethhdr
		{
		typedef struct wlan_ethhdr {
		u8 daddr[WLAN_ETHADDR_LEN];
		u8 saddr[WLAN_ETHADDR_LEN];
		u16 type;
		} __attribute__ ((packed)) wlan_ethhdr_t;

		/* local llc header type */
		typedef struct wlan_llc
		{
		typedef struct wlan_llc {
		u8 dsap;
		u8 ssap;
		u8 ctl;
		} __attribute__ ((packed)) wlan_llc_t;

		/* local snap header type */
		typedef struct wlan_snap
		{
		typedef struct wlan_snap {
		u8 oui[WLAN_IEEE_OUI_LEN];
		u16 type;
		} __attribute__ ((packed)) wlan_snap_t;
		@@ -165,9 +150,6 @@ typedef struct wlan_snap
		/* Circular include trick */
		struct wlandevice;

		/================================================================/
		/Function Declarations /

		int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,
		struct sk_buff *skb);
		int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv,

Admin message