diff options
| author |   Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-07-13 20:01:44 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:41 -0700 |
| commit | 0604384d4ba4cebb4e1c81a8b2c61958f49e31fe (patch) | |
| tree | cb524c2be1e503513fe74ee5444d13fcdb630b62 /drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | |
| parent | Staging: rtl8187se: remove ENABLE_IPS ifdefs (diff) | |
| download | linux-dev-0604384d4ba4cebb4e1c81a8b2c61958f49e31fe.tar.xz linux-dev-0604384d4ba4cebb4e1c81a8b2c61958f49e31fe.zip | |
Staging: rtl8187se: rename struct ieee80211_hdr to struct ieee80211_hdr_4addr
ieee80211_hdr name is too generic so use ieee80211_hdr_4addr one instead
(which matches the naming used by rtl8192su driver).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c')
| -rw-r--r-- | drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c index f520652954af..a23d6543d253 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c @@ -192,11 +192,11 @@ int ieee80211_encrypt_fragment( return -1; #ifdef CONFIG_IEEE80211_CRYPT_TKIP - struct ieee80211_hdr *header; + struct ieee80211_hdr_4addr *header; if (ieee->tkip_countermeasures && crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) { - header = (struct ieee80211_hdr *) frag->data; + header = (struct ieee80211_hdr_4addr *)frag->data; if (net_ratelimit()) { printk(KERN_DEBUG "%s: TKIP countermeasures: dropped " "TX packet to " MAC_FMT "\n", @@ -317,10 +317,6 @@ int ieee80211_xmit(struct sk_buff *skb, int ether_type, encrypt; int bytes, fc, QOS_ctl, hdr_len; struct sk_buff *skb_frag; - //struct ieee80211_hdr header = { /* Ensure zero initialized */ - // .duration_id = 0, - // .seq_ctl = 0 - //}; struct ieee80211_hdr_3addr_QOS header = { /* Ensure zero initialized */ .duration_id = 0, .seq_ctl = 0, |