Skip to content

Commit

Permalink
Staging: wlan-ng: fix style issues in p80211conv.h
Browse files Browse the repository at this point in the history 
This patch removes typedefs in p80211conv.h.

Signed-off-by: Edgardo Hames <ehames@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Edgardo Hames authored and Greg Kroah-Hartman committed Aug 3, 2010
1 parent 93df38e commit 51e4896
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 67 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/wlan-ng/hfa384x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,7 @@ int hfa384x_drvr_start(hfa384x_t *hw);
int hfa384x_drvr_stop(hfa384x_t *hw);
int
hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb,
union p80211_hdr *p80211_hdr, p80211_metawep_t *p80211_wep);
union p80211_hdr *p80211_hdr, struct p80211_metawep *p80211_wep);
void hfa384x_tx_timeout(wlandevice_t *wlandev);

int hfa384x_cmd_initialize(hfa384x_t *hw);
Expand Down
18 changes: 9 additions & 9 deletions drivers/staging/wlan-ng/hfa384x_usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2707,7 +2707,7 @@ int hfa384x_drvr_stop(hfa384x_t *hw)
----------------------------------------------------------------*/
int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb,
union p80211_hdr *p80211_hdr,
p80211_metawep_t *p80211_wep)
struct p80211_metawep *p80211_wep)
{
int usbpktlen = sizeof(hfa384x_tx_frame_t);
int result;
Expand Down Expand Up @@ -3473,7 +3473,7 @@ static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb)
hfa384x_usbin_t *usbin = (hfa384x_usbin_t *) skb->data;
hfa384x_t *hw = wlandev->priv;
int hdrlen;
p80211_rxmeta_t *rxmeta;
struct p80211_rxmeta *rxmeta;
u16 data_len;
u16 fc;

Expand Down Expand Up @@ -3590,14 +3590,14 @@ static void hfa384x_int_rxmonitor(wlandevice_t *wlandev,
datalen = le16_to_cpu(rxdesc->data_len);

/* Allocate an ind message+framesize skb */
skblen = sizeof(p80211_caphdr_t) + hdrlen + datalen + WLAN_CRC_LEN;
skblen = sizeof(struct p80211_caphdr) + hdrlen + datalen + WLAN_CRC_LEN;

/* sanity check the length */
if (skblen >
(sizeof(p80211_caphdr_t) +
(sizeof(struct p80211_caphdr) +
WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN)) {
pr_debug("overlen frm: len=%zd\n",
skblen - sizeof(p80211_caphdr_t));
skblen - sizeof(struct p80211_caphdr));
}

skb = dev_alloc_skb(skblen);
Expand All @@ -3611,13 +3611,13 @@ static void hfa384x_int_rxmonitor(wlandevice_t *wlandev,
/* only prepend the prism header if in the right mode */
if ((wlandev->netdev->type == ARPHRD_IEEE80211_PRISM) &&
(hw->sniffhdr != 0)) {
p80211_caphdr_t *caphdr;
struct p80211_caphdr *caphdr;
/* The NEW header format! */
datap = skb_put(skb, sizeof(p80211_caphdr_t));
caphdr = (p80211_caphdr_t *) datap;
datap = skb_put(skb, sizeof(struct p80211_caphdr));
caphdr = (struct p80211_caphdr *) datap;

caphdr->version = htonl(P80211CAPTURE_VERSION);
caphdr->length = htonl(sizeof(p80211_caphdr_t));
caphdr->length = htonl(sizeof(struct p80211_caphdr));
caphdr->mactime = __cpu_to_be64(rxdesc->time) * 1000;
caphdr->hosttime = __cpu_to_be64(jiffies);
caphdr->phytype = htonl(4); /* dss_dot11_b */
Expand Down
64 changes: 32 additions & 32 deletions drivers/staging/wlan-ng/p80211conv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,14 @@ static u8 oui_8021h[] = { 0x00, 0x00, 0xf8 };
----------------------------------------------------------------*/
int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv,
struct sk_buff *skb, union p80211_hdr *p80211_hdr,
p80211_metawep_t *p80211_wep)
struct p80211_metawep *p80211_wep)
{

u16 fc;
u16 proto;
wlan_ethhdr_t e_hdr;
wlan_llc_t *e_llc;
wlan_snap_t *e_snap;
struct wlan_ethhdr e_hdr;
struct wlan_llc *e_llc;
struct wlan_snap *e_snap;
int foo;

memcpy(&e_hdr, skb->data, sizeof(e_hdr));
Expand Down Expand Up @@ -148,7 +148,7 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv,

/* tack on SNAP */
e_snap =
(wlan_snap_t *) skb_push(skb, sizeof(wlan_snap_t));
(struct wlan_snap *) skb_push(skb, sizeof(struct wlan_snap));
e_snap->type = htons(proto);
if (ethconv == WLAN_ETHCONV_8021h
&& p80211_stt_findproto(proto)) {
Expand All @@ -161,7 +161,7 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv,

/* tack on llc */
e_llc =
(wlan_llc_t *) skb_push(skb, sizeof(wlan_llc_t));
(struct wlan_llc *) skb_push(skb, sizeof(struct wlan_llc));
e_llc->dsap = 0xAA; /* SNAP, see IEEE 802 */
e_llc->ssap = 0xAA;
e_llc->ctl = 0x03;
Expand Down Expand Up @@ -230,7 +230,7 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv,

/* jkriegl: from orinoco, modified */
static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac,
p80211_rxmeta_t *rxmeta)
struct p80211_rxmeta *rxmeta)
{
int i;

Expand Down Expand Up @@ -281,9 +281,9 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
u8 daddr[WLAN_ETHADDR_LEN];
u8 saddr[WLAN_ETHADDR_LEN];
union p80211_hdr *w_hdr;
wlan_ethhdr_t *e_hdr;
wlan_llc_t *e_llc;
wlan_snap_t *e_snap;
struct wlan_ethhdr *e_hdr;
struct wlan_llc *e_llc;
struct wlan_snap *e_snap;

int foo;

Expand Down Expand Up @@ -345,14 +345,14 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
wlandev->rx.decrypt++;
}

e_hdr = (wlan_ethhdr_t *) (skb->data + payload_offset);
e_hdr = (struct wlan_ethhdr *) (skb->data + payload_offset);

e_llc = (wlan_llc_t *) (skb->data + payload_offset);
e_llc = (struct wlan_llc *) (skb->data + payload_offset);
e_snap =
(wlan_snap_t *) (skb->data + payload_offset + sizeof(wlan_llc_t));
(struct wlan_snap *) (skb->data + payload_offset + sizeof(struct wlan_llc));

/* Test for the various encodings */
if ((payload_length >= sizeof(wlan_ethhdr_t)) &&
if ((payload_length >= sizeof(struct wlan_ethhdr)) &&
(e_llc->dsap != 0xaa || e_llc->ssap != 0xaa) &&
((memcmp(daddr, e_hdr->daddr, WLAN_ETHADDR_LEN) == 0) ||
(memcmp(saddr, e_hdr->saddr, WLAN_ETHADDR_LEN) == 0))) {
Expand All @@ -372,7 +372,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
/* chop off the 802.11 CRC */
skb_trim(skb, skb->len - WLAN_CRC_LEN);

} else if ((payload_length >= sizeof(wlan_llc_t) + sizeof(wlan_snap_t))
} else if ((payload_length >= sizeof(struct wlan_llc) + sizeof(struct wlan_snap))
&& (e_llc->dsap == 0xaa) && (e_llc->ssap == 0xaa)
&& (e_llc->ctl == 0x03)
&&
Expand All @@ -398,43 +398,43 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
skb_pull(skb, payload_offset);

/* create 802.3 header at beginning of skb. */
e_hdr = (wlan_ethhdr_t *) skb_push(skb, WLAN_ETHHDR_LEN);
e_hdr = (struct wlan_ethhdr *) skb_push(skb, WLAN_ETHHDR_LEN);
memcpy(e_hdr->daddr, daddr, WLAN_ETHADDR_LEN);
memcpy(e_hdr->saddr, saddr, WLAN_ETHADDR_LEN);
e_hdr->type = htons(payload_length);

/* chop off the 802.11 CRC */
skb_trim(skb, skb->len - WLAN_CRC_LEN);

} else if ((payload_length >= sizeof(wlan_llc_t) + sizeof(wlan_snap_t))
} else if ((payload_length >= sizeof(struct wlan_llc) + sizeof(struct wlan_snap))
&& (e_llc->dsap == 0xaa) && (e_llc->ssap == 0xaa)
&& (e_llc->ctl == 0x03)) {
pr_debug("802.1h/RFC1042 len: %d\n", payload_length);
/* it's an 802.1h frame || (an RFC1042 && protocol is not in STT) */
/* build a DIXII + RFC894 */

/* Test for an overlength frame */
if ((payload_length - sizeof(wlan_llc_t) - sizeof(wlan_snap_t))
if ((payload_length - sizeof(struct wlan_llc) - sizeof(struct wlan_snap))
> netdev->mtu) {
/* A bogus length ethfrm has been sent. */
/* Is someone trying an oflow attack? */
printk(KERN_ERR "DIXII frame too large (%ld > %d)\n",
(long int)(payload_length - sizeof(wlan_llc_t) -
sizeof(wlan_snap_t)), netdev->mtu);
(long int)(payload_length - sizeof(struct wlan_llc) -
sizeof(struct wlan_snap)), netdev->mtu);
return 1;
}

/* chop 802.11 header from skb. */
skb_pull(skb, payload_offset);

/* chop llc header from skb. */
skb_pull(skb, sizeof(wlan_llc_t));
skb_pull(skb, sizeof(struct wlan_llc));

/* chop snap header from skb. */
skb_pull(skb, sizeof(wlan_snap_t));
skb_pull(skb, sizeof(struct wlan_snap));

/* create 802.3 header at beginning of skb. */
e_hdr = (wlan_ethhdr_t *) skb_push(skb, WLAN_ETHHDR_LEN);
e_hdr = (struct wlan_ethhdr *) skb_push(skb, WLAN_ETHHDR_LEN);
e_hdr->type = e_snap->type;
memcpy(e_hdr->daddr, daddr, WLAN_ETHADDR_LEN);
memcpy(e_hdr->saddr, saddr, WLAN_ETHADDR_LEN);
Expand All @@ -461,7 +461,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
skb_pull(skb, payload_offset);

/* create 802.3 header at beginning of skb. */
e_hdr = (wlan_ethhdr_t *) skb_push(skb, WLAN_ETHHDR_LEN);
e_hdr = (struct wlan_ethhdr *) skb_push(skb, WLAN_ETHHDR_LEN);
memcpy(e_hdr->daddr, daddr, WLAN_ETHADDR_LEN);
memcpy(e_hdr->saddr, saddr, WLAN_ETHADDR_LEN);
e_hdr->type = htons(payload_length);
Expand Down Expand Up @@ -542,8 +542,8 @@ int p80211_stt_findproto(u16 proto)
----------------------------------------------------------------*/
void p80211skb_rxmeta_detach(struct sk_buff *skb)
{
p80211_rxmeta_t *rxmeta;
p80211_frmmeta_t *frmmeta;
struct p80211_rxmeta *rxmeta;
struct p80211_frmmeta *frmmeta;

/* Sanity checks */
if (skb == NULL) { /* bad skb */
Expand Down Expand Up @@ -589,8 +589,8 @@ void p80211skb_rxmeta_detach(struct sk_buff *skb)
int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb)
{
int result = 0;
p80211_rxmeta_t *rxmeta;
p80211_frmmeta_t *frmmeta;
struct p80211_rxmeta *rxmeta;
struct p80211_frmmeta *frmmeta;

/* If these already have metadata, we error out! */
if (P80211SKB_RXMETA(skb) != NULL) {
Expand All @@ -601,7 +601,7 @@ int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb)
}

/* Allocate the rxmeta */
rxmeta = kzalloc(sizeof(p80211_rxmeta_t), GFP_ATOMIC);
rxmeta = kzalloc(sizeof(struct p80211_rxmeta), GFP_ATOMIC);

if (rxmeta == NULL) {
printk(KERN_ERR "%s: Failed to allocate rxmeta.\n",
Expand All @@ -615,8 +615,8 @@ int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb)
rxmeta->hosttime = jiffies;

/* Overlay a frmmeta_t onto skb->cb */
memset(skb->cb, 0, sizeof(p80211_frmmeta_t));
frmmeta = (p80211_frmmeta_t *) (skb->cb);
memset(skb->cb, 0, sizeof(struct p80211_frmmeta));
frmmeta = (struct p80211_frmmeta *) (skb->cb);
frmmeta->magic = P80211_FRMMETA_MAGIC;
frmmeta->rx = rxmeta;
exit:
Expand All @@ -641,7 +641,7 @@ int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb)
----------------------------------------------------------------*/
void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb)
{
p80211_frmmeta_t *meta;
struct p80211_frmmeta *meta;

meta = P80211SKB_FRMMETA(skb);
if (meta && meta->rx)
Expand Down
40 changes: 20 additions & 20 deletions drivers/staging/wlan-ng/p80211conv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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);
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/wlan-ng/p80211netdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
int txresult = -1;
wlandevice_t *wlandev = netdev->ml_priv;
union p80211_hdr p80211_hdr;
p80211_metawep_t p80211_wep;
struct p80211_metawep p80211_wep;

if (skb == NULL)
return NETDEV_TX_OK;
Expand All @@ -362,7 +362,7 @@ static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
}

memset(&p80211_hdr, 0, sizeof(union p80211_hdr));
memset(&p80211_wep, 0, sizeof(p80211_metawep_t));
memset(&p80211_wep, 0, sizeof(struct p80211_metawep));

if (netif_queue_stopped(netdev)) {
pr_debug("called when queue stopped.\n");
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/wlan-ng/p80211netdev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ typedef struct wlandevice {
void (*reset) (struct wlandevice *wlandev);
int (*txframe) (struct wlandevice *wlandev, struct sk_buff *skb,
union p80211_hdr *p80211_hdr,
p80211_metawep_t *p80211_wep);
struct p80211_metawep *p80211_wep);
int (*mlmerequest) (struct wlandevice *wlandev, p80211msg_t *msg);
int (*set_multicast_list) (struct wlandevice *wlandev,
netdevice_t *dev);
Expand Down
Loading

0 comments on commit 51e4896

Please sign in to comment.