Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 6766
b: refs/heads/master
c: c0f72ca
h: refs/heads/master
v: v3
  • Loading branch information
Jouni Malinen authored and Jeff Garzik committed Aug 15, 2005
1 parent 104edb1 commit 95bbd07
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 120 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3ec0f4857df4c3dd0d0455ce5b2470b4be77fc77
refs/heads/master: c0f72ca8e4f1b459b5582c1c8dcaf7e53151f069
11 changes: 0 additions & 11 deletions trunk/drivers/net/wireless/hostap/hostap_80211.h
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
#ifndef HOSTAP_80211_H
#define HOSTAP_80211_H

struct hostap_ieee80211_hdr {
u16 frame_control;
u16 duration_id;
u8 addr1[6];
u8 addr2[6];
u8 addr3[6];
u16 seq_ctrl;
u8 addr4[6];
} __attribute__ ((packed));


struct hostap_ieee80211_mgmt {
u16 frame_control;
u16 duration;
Expand Down
60 changes: 30 additions & 30 deletions trunk/drivers/net/wireless/hostap/hostap_80211_rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,
struct hostap_80211_rx_status *rx_stats)
{
struct hostap_ieee80211_hdr *hdr;
struct ieee80211_hdr *hdr;
u16 fc;

hdr = (struct hostap_ieee80211_hdr *) skb->data;
hdr = (struct ieee80211_hdr *) skb->data;

printk(KERN_DEBUG "%s: RX signal=%d noise=%d rate=%d len=%d "
"jiffies=%ld\n",
Expand All @@ -19,7 +19,7 @@ void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,
if (skb->len < 2)
return;

fc = le16_to_cpu(hdr->frame_control);
fc = le16_to_cpu(hdr->frame_ctl);
printk(KERN_DEBUG " FC=0x%04x (type=%d:%d)%s%s",
fc, HOSTAP_FC_GET_TYPE(fc), HOSTAP_FC_GET_STYPE(fc),
fc & WLAN_FC_TODS ? " [ToDS]" : "",
Expand All @@ -31,7 +31,7 @@ void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,
}

printk(" dur=0x%04x seq=0x%04x\n", le16_to_cpu(hdr->duration_id),
le16_to_cpu(hdr->seq_ctrl));
le16_to_cpu(hdr->seq_ctl));

printk(KERN_DEBUG " A1=" MACSTR " A2=" MACSTR " A3=" MACSTR,
MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), MAC2STR(hdr->addr3));
Expand All @@ -51,7 +51,7 @@ int prism2_rx_80211(struct net_device *dev, struct sk_buff *skb,
int hdrlen, phdrlen, head_need, tail_need;
u16 fc;
int prism_header, ret;
struct hostap_ieee80211_hdr *hdr;
struct ieee80211_hdr *hdr;

iface = netdev_priv(dev);
local = iface->local;
Expand All @@ -70,8 +70,8 @@ int prism2_rx_80211(struct net_device *dev, struct sk_buff *skb,
phdrlen = 0;
}

hdr = (struct hostap_ieee80211_hdr *) skb->data;
fc = le16_to_cpu(hdr->frame_control);
hdr = (struct ieee80211_hdr *) skb->data;
fc = le16_to_cpu(hdr->frame_ctl);

if (type == PRISM2_RX_MGMT && (fc & WLAN_FC_PVER)) {
printk(KERN_DEBUG "%s: dropped management frame with header "
Expand Down Expand Up @@ -215,21 +215,21 @@ prism2_frag_cache_find(local_info_t *local, unsigned int seq,

/* Called only as a tasklet (software IRQ) */
static struct sk_buff *
prism2_frag_cache_get(local_info_t *local, struct hostap_ieee80211_hdr *hdr)
prism2_frag_cache_get(local_info_t *local, struct ieee80211_hdr *hdr)
{
struct sk_buff *skb = NULL;
u16 sc;
unsigned int frag, seq;
struct prism2_frag_entry *entry;

sc = le16_to_cpu(hdr->seq_ctrl);
sc = le16_to_cpu(hdr->seq_ctl);
frag = WLAN_GET_SEQ_FRAG(sc);
seq = WLAN_GET_SEQ_SEQ(sc) >> 4;

if (frag == 0) {
/* Reserve enough space to fit maximum frame length */
skb = dev_alloc_skb(local->dev->mtu +
sizeof(struct hostap_ieee80211_hdr) +
sizeof(struct ieee80211_hdr) +
8 /* LLC */ +
2 /* alignment */ +
8 /* WEP */ + ETH_ALEN /* WDS */);
Expand Down Expand Up @@ -267,13 +267,13 @@ prism2_frag_cache_get(local_info_t *local, struct hostap_ieee80211_hdr *hdr)

/* Called only as a tasklet (software IRQ) */
static int prism2_frag_cache_invalidate(local_info_t *local,
struct hostap_ieee80211_hdr *hdr)
struct ieee80211_hdr *hdr)
{
u16 sc;
unsigned int seq;
struct prism2_frag_entry *entry;

sc = le16_to_cpu(hdr->seq_ctrl);
sc = le16_to_cpu(hdr->seq_ctl);
seq = WLAN_GET_SEQ_SEQ(sc) >> 4;

entry = prism2_frag_cache_find(local, seq, -1, hdr->addr2, hdr->addr1);
Expand Down Expand Up @@ -441,7 +441,7 @@ hostap_rx_frame_mgmt(local_info_t *local, struct sk_buff *skb,
u16 stype)
{
if (local->iw_mode == IW_MODE_MASTER) {
hostap_update_sta_ps(local, (struct hostap_ieee80211_hdr *)
hostap_update_sta_ps(local, (struct ieee80211_hdr *)
skb->data);
}

Expand Down Expand Up @@ -519,7 +519,7 @@ static inline struct net_device *prism2_rx_get_wds(local_info_t *local,


static inline int
hostap_rx_frame_wds(local_info_t *local, struct hostap_ieee80211_hdr *hdr,
hostap_rx_frame_wds(local_info_t *local, struct ieee80211_hdr *hdr,
u16 fc, struct net_device **wds)
{
/* FIX: is this really supposed to accept WDS frames only in Master
Expand Down Expand Up @@ -577,14 +577,14 @@ static int hostap_is_eapol_frame(local_info_t *local, struct sk_buff *skb)
{
struct net_device *dev = local->dev;
u16 fc, ethertype;
struct hostap_ieee80211_hdr *hdr;
struct ieee80211_hdr *hdr;
u8 *pos;

if (skb->len < 24)
return 0;

hdr = (struct hostap_ieee80211_hdr *) skb->data;
fc = le16_to_cpu(hdr->frame_control);
hdr = (struct ieee80211_hdr *) skb->data;
fc = le16_to_cpu(hdr->frame_ctl);

/* check that the frame is unicast frame to us */
if ((fc & (WLAN_FC_TODS | WLAN_FC_FROMDS)) == WLAN_FC_TODS &&
Expand Down Expand Up @@ -615,14 +615,14 @@ static inline int
hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
struct ieee80211_crypt_data *crypt)
{
struct hostap_ieee80211_hdr *hdr;
struct ieee80211_hdr *hdr;
int res, hdrlen;

if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)
return 0;

hdr = (struct hostap_ieee80211_hdr *) skb->data;
hdrlen = hostap_80211_get_hdrlen(le16_to_cpu(hdr->frame_control));
hdr = (struct ieee80211_hdr *) skb->data;
hdrlen = hostap_80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));

if (local->tkip_countermeasures &&
strcmp(crypt->ops->name, "TKIP") == 0) {
Expand Down Expand Up @@ -654,14 +654,14 @@ static inline int
hostap_rx_frame_decrypt_msdu(local_info_t *local, struct sk_buff *skb,
int keyidx, struct ieee80211_crypt_data *crypt)
{
struct hostap_ieee80211_hdr *hdr;
struct ieee80211_hdr *hdr;
int res, hdrlen;

if (crypt == NULL || crypt->ops->decrypt_msdu == NULL)
return 0;

hdr = (struct hostap_ieee80211_hdr *) skb->data;
hdrlen = hostap_80211_get_hdrlen(le16_to_cpu(hdr->frame_control));
hdr = (struct ieee80211_hdr *) skb->data;
hdrlen = hostap_80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));

atomic_inc(&crypt->refcnt);
res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv);
Expand All @@ -685,7 +685,7 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
{
struct hostap_interface *iface;
local_info_t *local;
struct hostap_ieee80211_hdr *hdr;
struct ieee80211_hdr *hdr;
size_t hdrlen;
u16 fc, type, stype, sc;
struct net_device *wds = NULL;
Expand All @@ -712,16 +712,16 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
dev = local->ddev;
iface = netdev_priv(dev);

hdr = (struct hostap_ieee80211_hdr *) skb->data;
hdr = (struct ieee80211_hdr *) skb->data;
stats = hostap_get_stats(dev);

if (skb->len < 10)
goto rx_dropped;

fc = le16_to_cpu(hdr->frame_control);
fc = le16_to_cpu(hdr->frame_ctl);
type = HOSTAP_FC_GET_TYPE(fc);
stype = HOSTAP_FC_GET_STYPE(fc);
sc = le16_to_cpu(hdr->seq_ctrl);
sc = le16_to_cpu(hdr->seq_ctl);
frag = WLAN_GET_SEQ_FRAG(sc);
hdrlen = hostap_80211_get_hdrlen(fc);

Expand Down Expand Up @@ -883,7 +883,7 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
if (local->host_decrypt && (fc & WLAN_FC_ISWEP) &&
(keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0)
goto rx_dropped;
hdr = (struct hostap_ieee80211_hdr *) skb->data;
hdr = (struct ieee80211_hdr *) skb->data;

/* skb: hdr + (possibly fragmented) plaintext payload */

Expand Down Expand Up @@ -935,7 +935,7 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
/* this was the last fragment and the frame will be
* delivered, so remove skb from fragment cache */
skb = frag_skb;
hdr = (struct hostap_ieee80211_hdr *) skb->data;
hdr = (struct ieee80211_hdr *) skb->data;
prism2_frag_cache_invalidate(local, hdr);
}

Expand All @@ -946,7 +946,7 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
hostap_rx_frame_decrypt_msdu(local, skb, keyidx, crypt))
goto rx_dropped;

hdr = (struct hostap_ieee80211_hdr *) skb->data;
hdr = (struct ieee80211_hdr *) skb->data;
if (crypt && !(fc & WLAN_FC_ISWEP) && !local->open_wep) {
if (local->ieee_802_1x &&
hostap_is_eapol_frame(local, skb)) {
Expand Down
36 changes: 18 additions & 18 deletions trunk/drivers/net/wireless/hostap/hostap_80211_tx.c
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
void hostap_dump_tx_80211(const char *name, struct sk_buff *skb)
{
struct hostap_ieee80211_hdr *hdr;
struct ieee80211_hdr *hdr;
u16 fc;

hdr = (struct hostap_ieee80211_hdr *) skb->data;
hdr = (struct ieee80211_hdr *) skb->data;

printk(KERN_DEBUG "%s: TX len=%d jiffies=%ld\n",
name, skb->len, jiffies);

if (skb->len < 2)
return;

fc = le16_to_cpu(hdr->frame_control);
fc = le16_to_cpu(hdr->frame_ctl);
printk(KERN_DEBUG " FC=0x%04x (type=%d:%d)%s%s",
fc, HOSTAP_FC_GET_TYPE(fc), HOSTAP_FC_GET_STYPE(fc),
fc & WLAN_FC_TODS ? " [ToDS]" : "",
Expand All @@ -23,7 +23,7 @@ void hostap_dump_tx_80211(const char *name, struct sk_buff *skb)
}

printk(" dur=0x%04x seq=0x%04x\n", le16_to_cpu(hdr->duration_id),
le16_to_cpu(hdr->seq_ctrl));
le16_to_cpu(hdr->seq_ctl));

printk(KERN_DEBUG " A1=" MACSTR " A2=" MACSTR " A3=" MACSTR,
MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), MAC2STR(hdr->addr3));
Expand All @@ -41,7 +41,7 @@ int hostap_data_start_xmit(struct sk_buff *skb, struct net_device *dev)
struct hostap_interface *iface;
local_info_t *local;
int need_headroom, need_tailroom = 0;
struct hostap_ieee80211_hdr hdr;
struct ieee80211_hdr hdr;
u16 fc, ethertype = 0;
enum {
WDS_NO = 0, WDS_OWN_FRAME, WDS_COMPLIANT_FRAME
Expand Down Expand Up @@ -180,7 +180,7 @@ int hostap_data_start_xmit(struct sk_buff *skb, struct net_device *dev)
memcpy(&hdr.addr3, local->bssid, ETH_ALEN);
}

hdr.frame_control = cpu_to_le16(fc);
hdr.frame_ctl = cpu_to_le16(fc);

skb_pull(skb, skip_header_bytes);
need_headroom = local->func->need_tx_headroom + hdr_len + encaps_len;
Expand Down Expand Up @@ -244,7 +244,7 @@ int hostap_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev)
struct hostap_interface *iface;
local_info_t *local;
struct hostap_skb_tx_data *meta;
struct hostap_ieee80211_hdr *hdr;
struct ieee80211_hdr *hdr;
u16 fc;

iface = netdev_priv(dev);
Expand All @@ -266,8 +266,8 @@ int hostap_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev)
meta->iface = iface;

if (skb->len >= IEEE80211_DATA_HDR3_LEN + sizeof(rfc1042_header) + 2) {
hdr = (struct hostap_ieee80211_hdr *) skb->data;
fc = le16_to_cpu(hdr->frame_control);
hdr = (struct ieee80211_hdr *) skb->data;
fc = le16_to_cpu(hdr->frame_ctl);
if (HOSTAP_FC_GET_TYPE(fc) == WLAN_FC_TYPE_DATA &&
HOSTAP_FC_GET_STYPE(fc) == WLAN_FC_STYPE_DATA) {
u8 *pos = &skb->data[IEEE80211_DATA_HDR3_LEN +
Expand All @@ -289,7 +289,7 @@ struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
{
struct hostap_interface *iface;
local_info_t *local;
struct hostap_ieee80211_hdr *hdr;
struct ieee80211_hdr *hdr;
u16 fc;
int hdr_len, res;

Expand All @@ -303,7 +303,7 @@ struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,

if (local->tkip_countermeasures &&
crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) {
hdr = (struct hostap_ieee80211_hdr *) skb->data;
hdr = (struct ieee80211_hdr *) skb->data;
if (net_ratelimit()) {
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
"TX packet to " MACSTR "\n",
Expand All @@ -325,8 +325,8 @@ struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
return NULL;
}

hdr = (struct hostap_ieee80211_hdr *) skb->data;
fc = le16_to_cpu(hdr->frame_control);
hdr = (struct ieee80211_hdr *) skb->data;
fc = le16_to_cpu(hdr->frame_ctl);
hdr_len = hostap_80211_get_hdrlen(fc);

/* Host-based IEEE 802.11 fragmentation for TX is not yet supported, so
Expand Down Expand Up @@ -360,7 +360,7 @@ int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
ap_tx_ret tx_ret;
struct hostap_skb_tx_data *meta;
int no_encrypt = 0;
struct hostap_ieee80211_hdr *hdr;
struct ieee80211_hdr *hdr;

iface = netdev_priv(dev);
local = iface->local;
Expand Down Expand Up @@ -403,8 +403,8 @@ int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
tx_ret = hostap_handle_sta_tx(local, &tx);
skb = tx.skb;
meta = (struct hostap_skb_tx_data *) skb->cb;
hdr = (struct hostap_ieee80211_hdr *) skb->data;
fc = le16_to_cpu(hdr->frame_control);
hdr = (struct ieee80211_hdr *) skb->data;
fc = le16_to_cpu(hdr->frame_ctl);
switch (tx_ret) {
case AP_TX_CONTINUE:
break;
Expand Down Expand Up @@ -445,7 +445,7 @@ int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev)

/* remove special version from the frame header */
fc &= ~WLAN_FC_PVER;
hdr->frame_control = cpu_to_le16(fc);
hdr->frame_ctl = cpu_to_le16(fc);
}

if (HOSTAP_FC_GET_TYPE(fc) != WLAN_FC_TYPE_DATA) {
Expand All @@ -467,7 +467,7 @@ int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* Add ISWEP flag both for firmware and host based encryption
*/
fc |= WLAN_FC_ISWEP;
hdr->frame_control = cpu_to_le16(fc);
hdr->frame_ctl = cpu_to_le16(fc);
} else if (local->drop_unencrypted &&
HOSTAP_FC_GET_TYPE(fc) == WLAN_FC_TYPE_DATA &&
meta->ethertype != ETH_P_PAE) {
Expand Down
Loading

0 comments on commit 95bbd07

Please sign in to comment.