]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'for-greg' of git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2014 03:01:12 +0000 (03:01 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2014 03:01:12 +0000 (03:01 +0000)
15 files changed:
drivers/staging/comedi/drivers/plx9080.h
drivers/staging/crystalhd/bcm_70012_regs.h
drivers/staging/dgnc/dgnc_mgmt.c
drivers/staging/dgrp/dgrp_sysfs.c
drivers/staging/dgrp/dgrp_tty.c
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
drivers/staging/rtl8192u/r8192U_core.c
drivers/staging/rtl8821ae/rtl8821ae/trx.c
drivers/staging/rts5139/xd.c
drivers/staging/sbe-2t3e3/maps.c
drivers/staging/slicoss/slicoss.c
drivers/staging/vt6656/iwctl.c
drivers/staging/wlags49_h2/wl_main.c
drivers/staging/wlan-ng/p80211mgmt.h

index 55e3c2e2bc5292622ab32294361ce191531c240a..25706531b885489a3ff016a2b671429ff7e9e0a7 100644 (file)
 
 /*  descriptor block used for chained dma transfers */
 struct plx_dma_desc {
-       volatile uint32_t pci_start_addr;
-       volatile uint32_t local_start_addr;
+       __le32 pci_start_addr;
+       __le32 local_start_addr;
        /* transfer_size is in bytes, only first 23 bits of register are used */
-       volatile uint32_t transfer_size;
+       __le32 transfer_size;
        /* address of next descriptor (quad word aligned), plus some
         * additional bits (see PLX_DMA0_DESCRIPTOR_REG) */
-       volatile uint32_t next;
+       __le32 next;
 };
 
 /**********************************************************************
index f3ab3146cd907c78b01439d255719a4fef9c3aa0..da199ad8e27ef5f4c9c27533730c0221a72594be 100644 (file)
@@ -31,7 +31,8 @@
 #define BRCM_SHIFT(c, r, f)   c##_##r##_##f##_SHIFT
 
 #define GET_FIELD(m, c, r, f) \
-       ((((m) & BRCM_MASK(c, r, f)) >> BRCM_SHIFT(c, r, f)) << BRCM_ALIGN(c, r, f))
+       ((((m) & BRCM_MASK(c, r, f)) >> BRCM_SHIFT(c, r, f)) << \
+        BRCM_ALIGN(c, r, f))
 
 #define SET_FIELD(m, c, r, f, d) \
        ((m) = (((m) & ~BRCM_MASK(c, r, f)) | ((((d) >> BRCM_ALIGN(c, r, f)) << \
index 1c5ab3d007b00e126348cf0b3cace1b250b9a81f..65f2d22e72c6ea947ceb236edd0aca9ab43e1993 100644 (file)
@@ -42,7 +42,7 @@
 #include <linux/interrupt.h>   /* For tasklet and interrupt structs/defines */
 #include <linux/serial_reg.h>
 #include <linux/termios.h>
-#include <asm/uaccess.h>       /* For copy_from_user/copy_to_user */
+#include <linux/uaccess.h>     /* For copy_from_user/copy_to_user */
 
 #include "dgnc_driver.h"
 #include "dgnc_pci.h"
@@ -77,8 +77,7 @@ int dgnc_mgmt_open(struct inode *inode, struct file *file)
                        return -EBUSY;
                }
                dgnc_mgmt_in_use[minor]++;
-       }
-       else {
+       } else {
                DGNC_UNLOCK(dgnc_global_lock, lock_flags);
                return -ENXIO;
        }
@@ -107,9 +106,8 @@ int dgnc_mgmt_close(struct inode *inode, struct file *file)
 
        /* mgmt device */
        if (minor < MAXMGMTDEVICES) {
-               if (dgnc_mgmt_in_use[minor]) {
+               if (dgnc_mgmt_in_use[minor])
                        dgnc_mgmt_in_use[minor] = 0;
-               }
        }
        DGNC_UNLOCK(dgnc_global_lock, lock_flags);
 
@@ -153,7 +151,7 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                DPR_MGMT(("DIGI_GETDD returning numboards: %d version: %s\n",
                        ddi.dinfo_nboards, ddi.dinfo_version));
 
-               if (copy_to_user(uarg, &ddi, sizeof (ddi)))
+               if (copy_to_user(uarg, &ddi, sizeof(ddi)))
                        return -EFAULT;
 
                break;
@@ -165,9 +163,8 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
                struct digi_info di;
 
-               if (copy_from_user(&brd, uarg, sizeof(int))) {
+               if (copy_from_user(&brd, uarg, sizeof(int)))
                        return -EFAULT;
-               }
 
                DPR_MGMT(("DIGI_GETBD asking about board: %d\n", brd));
 
@@ -195,7 +192,7 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                DPR_MGMT(("DIGI_GETBD returning type: %x state: %x ports: %x size: %x\n",
                        di.info_bdtype, di.info_bdstate, di.info_nports, di.info_physsize));
 
-               if (copy_to_user(uarg, &di, sizeof (di)))
+               if (copy_to_user(uarg, &di, sizeof(di)))
                        return -EFAULT;
 
                break;
@@ -209,9 +206,8 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                uint board = 0;
                uint channel = 0;
 
-               if (copy_from_user(&ni, uarg, sizeof(ni))) {
+               if (copy_from_user(&ni, uarg, sizeof(ni)))
                        return -EFAULT;
-               }
 
                DPR_MGMT(("DIGI_GETBD asking about board: %d channel: %d\n",
                        ni.board, ni.channel));
index 9a18a2c9e73b20932ecb72d7fd6469617580c7c8..2f9345ff0abb3cc63d5603e13900487cbfaf01a5 100644 (file)
@@ -65,7 +65,9 @@ static ssize_t dgrp_class_pollrate_store(struct device *c,
                                         struct device_attribute *attr,
                                         const char *buf, size_t count)
 {
-       sscanf(buf, "0x%x\n", &dgrp_poll_tick);
+       if (sscanf(buf, "0x%x\n", &dgrp_poll_tick) != 1)
+               return -EINVAL;
+
        return count;
 }
 static DEVICE_ATTR(pollrate, 0600, dgrp_class_pollrate_show,
index 7a9694c1d9c4f6fd9546b3fa340c14d56f1b6e33..9dba943cdbe626827cf9bdc8184756d80e8350b8 100644 (file)
@@ -2798,6 +2798,7 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                }
 
                /* pretend we didn't recognize this */
+               /* fall-through */
 
        case DIGI_SETA:
                return dgrp_tty_digiseta(tty, (struct digi_struct *) arg);
index 65cdec4419dbba6b4b838763f190a54fa247470f..db6b2ad71d092931b69eeda7f44997a2af64c2a4 100644 (file)
 #include <linux/etherdevice.h>
 
 #include "dot11d.h"
-static u8 rsn_authen_cipher_suite[16][4] = {
-       {0x00, 0x0F, 0xAC, 0x00}, //Use group key, //Reserved
-       {0x00, 0x0F, 0xAC, 0x01}, //WEP-40         //RSNA default
-       {0x00, 0x0F, 0xAC, 0x02}, //TKIP           //NONE               //{used just as default}
-       {0x00, 0x0F, 0xAC, 0x03}, //WRAP-historical
-       {0x00, 0x0F, 0xAC, 0x04}, //CCMP
-       {0x00, 0x0F, 0xAC, 0x05}, //WEP-104
-};
 
 short ieee80211_is_54g(const struct ieee80211_network *net)
 {
index 662c7e41cd5cec78a9ade7c7ae1703c7db01c262..277728afb3efa25b2b55fb13532e7d64e89f5ff0 100644 (file)
 
 #include "dot11d.h"
 
-u8 rsn_authen_cipher_suite[16][4] = {
-       {0x00,0x0F,0xAC,0x00}, //Use group key, //Reserved
-       {0x00,0x0F,0xAC,0x01}, //WEP-40         //RSNA default
-       {0x00,0x0F,0xAC,0x02}, //TKIP           //NONE          //{used just as default}
-       {0x00,0x0F,0xAC,0x03}, //WRAP-historical
-       {0x00,0x0F,0xAC,0x04}, //CCMP
-       {0x00,0x0F,0xAC,0x05}, //WEP-104
-};
-
 short ieee80211_is_54g(const struct ieee80211_network *net)
 {
        return (net->rates_ex_len > 0) || (net->rates_len > 4);
@@ -1959,7 +1950,8 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
                        struct ieee80211_network network_resp;
                        struct ieee80211_network *network = &network_resp;
 
-                       if (0 == (errcode=assoc_parse(ieee,skb, &aid))){
+                       errcode = assoc_parse(ieee, skb, &aid);
+                       if (!errcode) {
                                ieee->state=IEEE80211_LINKED;
                                ieee->assoc_id = aid;
                                ieee->softmac_stats.rx_ass_ok++;
@@ -2017,7 +2009,8 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
 
                                        IEEE80211_DEBUG_MGMT("Received authentication response");
 
-                                       if (0 == (errcode=auth_parse(skb, &challenge, &chlen))){
+                                       errcode = auth_parse(skb, &challenge, &chlen);
+                                       if (!errcode) {
                                                if(ieee->open_wep || !challenge){
                                                        ieee->state = IEEE80211_ASSOCIATING_AUTHENTICATED;
                                                        ieee->softmac_stats.rx_auth_rs_ok++;
index a56be798c164ef841bc55522cf6759346df04989..834afca0c74bc5ab828a276901d4859e764b9cbf 100644 (file)
@@ -1318,7 +1318,8 @@ static void rtl8192_tx_isr(struct urb *tx_urb)
                /* Don't send data frame during scanning.*/
                if ((skb_queue_len(&priv->ieee80211->skb_waitQ[queue_index]) != 0) &&
                    (!(priv->ieee80211->queue_stop))) {
-                       if (NULL != (skb = skb_dequeue(&(priv->ieee80211->skb_waitQ[queue_index]))))
+                       skb = skb_dequeue(&(priv->ieee80211->skb_waitQ[queue_index]));
+                       if (skb)
                                priv->ieee80211->softmac_hard_start_xmit(skb, dev);
 
                        return; //modified by david to avoid further processing AMSDU
index 5f3246454e3ee778a7f091c97c6d1129512cbd48..dd0f6dcb30859bced6fa096f8762d7b9d8c7f389 100644 (file)
@@ -38,7 +38,7 @@
 #include "led.h"
 #include "dm.h"
 
-u8 _rtl8821ae_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
+static u8 _rtl8821ae_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
 {
        u16 fc = rtl_get_fc(skb);
 
index 10fea7e16ace00dedfd9c4a6573d4643246c2ce9..be432351be8665c09df85b94bc3087e0122a54cc 100644 (file)
@@ -473,7 +473,8 @@ static int reset_xd(struct rts51x_chip *chip)
                rts51x_add_cmd(chip, WRITE_REG_CMD, XD_DTCTL, 0xFF,
                        XD_TIME_SETUP_STEP * 3 + XD_TIME_RW_STEP *
                        (2 + i + chip->option.rts51x_xd_rw_step)
-                       + XD_TIME_RWN_STEP * (i + chip->option.rts51x_xd_rwn_step));
+                       + XD_TIME_RWN_STEP *
+                       (i + chip->option.rts51x_xd_rwn_step));
                rts51x_add_cmd(chip, WRITE_REG_CMD, XD_CATCTL, 0xFF,
                        XD_TIME_SETUP_STEP * 3 + XD_TIME_RW_STEP * (4 +
                        i) + XD_TIME_RWN_STEP * (3 + i));
@@ -1526,8 +1527,8 @@ static int xd_read_multiple_pages(struct rts51x_chip *chip, u32 phy_blk,
        rts51x_add_cmd(chip, WRITE_REG_CMD, XD_CHK_DATA_STATUS,
                       XD_AUTO_CHK_DATA_STATUS, XD_AUTO_CHK_DATA_STATUS);
 
-       rts51x_trans_dma_enable(chip->srb->sc_data_direction, chip, page_cnt * 512,
-                        DMA_512);
+       rts51x_trans_dma_enable(chip->srb->sc_data_direction, chip,
+                       page_cnt * 512, DMA_512);
 
        rts51x_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
                       XD_TRANSFER_START | XD_READ_PAGES);
@@ -1745,8 +1746,8 @@ static int xd_write_multiple_pages(struct rts51x_chip *chip, u32 old_blk,
        rts51x_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01,
                       RING_BUFFER);
 
-       rts51x_trans_dma_enable(chip->srb->sc_data_direction, chip, page_cnt * 512,
-                        DMA_512);
+       rts51x_trans_dma_enable(chip->srb->sc_data_direction, chip,
+                       page_cnt * 512, DMA_512);
 
        rts51x_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
                       XD_TRANSFER_START | XD_WRITE_PAGES);
@@ -1842,8 +1843,8 @@ static int xd_delay_write(struct rts51x_chip *chip)
        return STATUS_SUCCESS;
 }
 
-int rts51x_xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
-         u16 sector_cnt)
+int rts51x_xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip,
+       u32 start_sector, u16 sector_cnt)
 {
        struct xd_info *xd_card = &(chip->xd_card);
        unsigned int lun = SCSI_LUN(srb);
@@ -1883,7 +1884,8 @@ int rts51x_xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sect
                retval = xd_build_l2p_tbl(chip, zone_no);
                if (retval != STATUS_SUCCESS) {
                        chip->card_fail |= XD_CARD;
-                       rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                       rts51x_set_sense_type(chip, lun,
+                               SENSE_TYPE_MEDIA_NOT_PRESENT);
                        TRACE_RET(chip, retval);
                }
        }
index 7084fbe7b79411b00146f415c99d1205aefe2b4b..e5494502cde16819acb3317b4015f7cfdeedcdbf 100644 (file)
@@ -13,8 +13,7 @@
 #include <linux/kernel.h>
 #include "2t3e3.h"
 
-const u32 cpld_reg_map[][2] =
-{
+const u32 cpld_reg_map[][2] = {
        { 0x0000, 0x0080 }, /* 0 - Port Control Register A (PCRA) */
        { 0x0004, 0x0084 }, /* 1 - Port Control Register B (PCRB) */
        { 0x0008, 0x0088 }, /* 2 - LCV Count Register (PLCR) */
@@ -35,8 +34,7 @@ const u32 cpld_reg_map[][2] =
        { 0x0070, 0x00f0 }, /* 17 - Port Bandwidth Stop (PBWL) */
 };
 
-const u32 cpld_val_map[][2] =
-{
+const u32 cpld_val_map[][2] = {
        { 0x01, 0x02 }, /* LIU1 / LIU2 select for Serial Chip Select */
        { 0x04, 0x08 }, /* DAC1 / DAC2 select for Serial Chip Select */
        { 0x00, 0x04 }, /* LOOP1 / LOOP2 - select of loop timing source */
@@ -94,8 +92,7 @@ const u32 t3e3_framer_reg_map[] = {
        0x81  /* 47 - LINE_INTERFACE_SCAN */
 };
 
-const u32 t3e3_liu_reg_map[] =
-{
+const u32 t3e3_liu_reg_map[] = {
        0x00, /* REG0 */
        0x01, /* REG1 */
        0x02, /* REG2 */
index 758c4efea0dedf2d0757b0fae83bd57ea988f206..12aafe37720c04cfd43320640763547b9d64d065 100644 (file)
@@ -156,17 +156,6 @@ MODULE_DEVICE_TABLE(pci, slic_pci_tbl);
                        _adapter->handle_lock.flags);                   \
 }
 
-#define SLIC_FREE_SLIC_HANDLE(_adapter, _pslic_handle)                  \
-{                                                                       \
-       _pslic_handle->type = SLIC_HANDLE_FREE;                         \
-       spin_lock_irqsave(&_adapter->handle_lock.lock,                  \
-                       _adapter->handle_lock.flags);                   \
-       _pslic_handle->next = _adapter->pfree_slic_handles;             \
-       _adapter->pfree_slic_handles = _pslic_handle;                   \
-       spin_unlock_irqrestore(&_adapter->handle_lock.lock,             \
-                       _adapter->handle_lock.flags);                   \
-}
-
 static inline void slic_reg32_write(void __iomem *reg, u32 value, bool flush)
 {
        writel(value, reg);
index bedc8104e835bc893427911818e3456e4da62b7f..cf4c06a4288093992959e6d26725ef6ca8b8970d 100644 (file)
@@ -1395,7 +1395,8 @@ int iwctl_giwpower(struct net_device *dev, struct iw_request_info *info,
        if (pMgmt == NULL)
                return -EFAULT;
 
-       if ((wrq->disabled = (mode == WMAC_POWER_CAM)))
+       wrq->disabled = (mode == WMAC_POWER_CAM);
+       if (wrq->disabled)
                return 0;
 
        if ((wrq->flags & IW_POWER_TYPE) == IW_POWER_TIMEOUT) {
index bf6a62eef81566194379f76df49ada3610c130f7..fc98b6dbdb897766c3410c5a3ca988138a960af7 100644 (file)
@@ -1528,7 +1528,8 @@ int wl_put_ltv( struct wl_private *lp )
        hcf_status = hcf_put_info( &lp->hcfCtx, (LTVP)&( lp->ltvRecord ));
 
        /* Own Name (Station Nickname) */
-       if (( len = ( strlen( lp->StationName ) + 1 ) & ~0x01 ) != 0 ) {
+       len = (strlen(lp->StationName) + 1) & ~0x01;
+       if (len != 0) {
                //DBG_TRACE( DbgInfo, "CFG_CNF_OWN_NAME                  : %s\n",
                //           lp->StationName );
 
index 3f5ccd2df54a93b7c5c2dbd166afb7cdf7365841..3dd066ac034e9cedb01ac560af34c3211b4f84c3 100644 (file)
 /*-- Information Element Types --------------------*/
 /* prototype structure, all IEs start with these members */
 
-typedef struct wlan_ie {
+struct wlan_ie {
        u8 eid;
        u8 len;
-} __packed wlan_ie_t;
+} __packed;
 
 /*-- Service Set Identity (SSID)  -----------------*/
-typedef struct wlan_ie_ssid {
+struct wlan_ie_ssid {
        u8 eid;
        u8 len;
        u8 ssid[1];             /* may be zero, ptrs may overlap */
-} __packed wlan_ie_ssid_t;
+} __packed;
 
 /*-- Supported Rates  -----------------------------*/
-typedef struct wlan_ie_supp_rates {
+struct wlan_ie_supp_rates {
        u8 eid;
        u8 len;
        u8 rates[1];            /* had better be at LEAST one! */
-} __packed wlan_ie_supp_rates_t;
+} __packed;
 
 /*-- FH Parameter Set  ----------------------------*/
-typedef struct wlan_ie_fh_parms {
+struct wlan_ie_fh_parms {
        u8 eid;
        u8 len;
        u16 dwell;
        u8 hopset;
        u8 hoppattern;
        u8 hopindex;
-} __packed wlan_ie_fh_parms_t;
+} __packed;
 
 /*-- DS Parameter Set  ----------------------------*/
-typedef struct wlan_ie_ds_parms {
+struct wlan_ie_ds_parms {
        u8 eid;
        u8 len;
        u8 curr_ch;
-} __packed wlan_ie_ds_parms_t;
+} __packed;
 
 /*-- CF Parameter Set  ----------------------------*/
 
-typedef struct wlan_ie_cf_parms {
+struct wlan_ie_cf_parms {
        u8 eid;
        u8 len;
        u8 cfp_cnt;
        u8 cfp_period;
        u16 cfp_maxdur;
        u16 cfp_durremaining;
-} __packed wlan_ie_cf_parms_t;
+} __packed;
 
 /*-- TIM ------------------------------------------*/
-typedef struct wlan_ie_tim {
+struct wlan_ie_tim {
        u8 eid;
        u8 len;
        u8 dtim_cnt;
        u8 dtim_period;
        u8 bitmap_ctl;
        u8 virt_bm[1];
-} __packed wlan_ie_tim_t;
+} __packed;
 
 /*-- IBSS Parameter Set ---------------------------*/
-typedef struct wlan_ie_ibss_parms {
+struct wlan_ie_ibss_parms {
        u8 eid;
        u8 len;
        u16 atim_win;
-} __packed wlan_ie_ibss_parms_t;
+} __packed;
 
 /*-- Challenge Text  ------------------------------*/
-typedef struct wlan_ie_challenge {
+struct wlan_ie_challenge {
        u8 eid;
        u8 len;
        u8 challenge[1];
-} __packed wlan_ie_challenge_t;
+} __packed;
 
 /*-------------------------------------------------*/
 /*  Frame Types  */
 
 /* prototype structure, all mgmt frame types will start with these members */
-typedef struct wlan_fr_mgmt {
+struct wlan_fr_mgmt {
        u16 type;
        u16 len;                /* DOES NOT include CRC !!!! */
        u8 *buf;
@@ -303,10 +303,10 @@ typedef struct wlan_fr_mgmt {
        void *priv;
        /*-- fixed fields -----------*/
        /*-- info elements ----------*/
-} wlan_fr_mgmt_t;
+};
 
 /*-- Beacon ---------------------------------------*/
-typedef struct wlan_fr_beacon {
+struct wlan_fr_beacon {
        u16 type;
        u16 len;
        u8 *buf;
@@ -318,18 +318,18 @@ typedef struct wlan_fr_beacon {
        u16 *bcn_int;
        u16 *cap_info;
        /*-- info elements ----------*/
-       wlan_ie_ssid_t *ssid;
-       wlan_ie_supp_rates_t *supp_rates;
-       wlan_ie_fh_parms_t *fh_parms;
-       wlan_ie_ds_parms_t *ds_parms;
-       wlan_ie_cf_parms_t *cf_parms;
-       wlan_ie_ibss_parms_t *ibss_parms;
-       wlan_ie_tim_t *tim;
+       struct wlan_ie_ssid *ssid;
+       struct wlan_ie_supp_rates *supp_rates;
+       struct wlan_ie_fh_parms *fh_parms;
+       struct wlan_ie_ds_parms *ds_parms;
+       struct wlan_ie_cf_parms *cf_parms;
+       struct wlan_ie_ibss_parms *ibss_parms;
+       struct wlan_ie_tim *tim;
 
-} wlan_fr_beacon_t;
+};
 
 /*-- IBSS ATIM ------------------------------------*/
-typedef struct wlan_fr_ibssatim {
+struct wlan_fr_ibssatim {
        u16 type;
        u16 len;
        u8 *buf;
@@ -342,10 +342,10 @@ typedef struct wlan_fr_ibssatim {
 
        /* this frame type has a null body */
 
-} wlan_fr_ibssatim_t;
+};
 
 /*-- Disassociation -------------------------------*/
-typedef struct wlan_fr_disassoc {
+struct wlan_fr_disassoc {
        u16 type;
        u16 len;
        u8 *buf;
@@ -357,10 +357,10 @@ typedef struct wlan_fr_disassoc {
 
        /*-- info elements ----------*/
 
-} wlan_fr_disassoc_t;
+};
 
 /*-- Association Request --------------------------*/
-typedef struct wlan_fr_assocreq {
+struct wlan_fr_assocreq {
        u16 type;
        u16 len;
        u8 *buf;
@@ -371,13 +371,13 @@ typedef struct wlan_fr_assocreq {
        u16 *cap_info;
        u16 *listen_int;
        /*-- info elements ----------*/
-       wlan_ie_ssid_t *ssid;
-       wlan_ie_supp_rates_t *supp_rates;
+       struct wlan_ie_ssid *ssid;
+       struct wlan_ie_supp_rates *supp_rates;
 
-} wlan_fr_assocreq_t;
+};
 
 /*-- Association Response -------------------------*/
-typedef struct wlan_fr_assocresp {
+struct wlan_fr_assocresp {
        u16 type;
        u16 len;
        u8 *buf;
@@ -389,12 +389,12 @@ typedef struct wlan_fr_assocresp {
        u16 *status;
        u16 *aid;
        /*-- info elements ----------*/
-       wlan_ie_supp_rates_t *supp_rates;
+       struct wlan_ie_supp_rates *supp_rates;
 
-} wlan_fr_assocresp_t;
+};
 
 /*-- Reassociation Request ------------------------*/
-typedef struct wlan_fr_reassocreq {
+struct wlan_fr_reassocreq {
        u16 type;
        u16 len;
        u8 *buf;
@@ -406,13 +406,13 @@ typedef struct wlan_fr_reassocreq {
        u16 *listen_int;
        u8 *curr_ap;
        /*-- info elements ----------*/
-       wlan_ie_ssid_t *ssid;
-       wlan_ie_supp_rates_t *supp_rates;
+       struct wlan_ie_ssid *ssid;
+       struct wlan_ie_supp_rates *supp_rates;
 
-} wlan_fr_reassocreq_t;
+};
 
 /*-- Reassociation Response -----------------------*/
-typedef struct wlan_fr_reassocresp {
+struct wlan_fr_reassocresp {
        u16 type;
        u16 len;
        u8 *buf;
@@ -424,12 +424,12 @@ typedef struct wlan_fr_reassocresp {
        u16 *status;
        u16 *aid;
        /*-- info elements ----------*/
-       wlan_ie_supp_rates_t *supp_rates;
+       struct wlan_ie_supp_rates *supp_rates;
 
-} wlan_fr_reassocresp_t;
+};
 
 /*-- Probe Request --------------------------------*/
-typedef struct wlan_fr_probereq {
+struct wlan_fr_probereq {
        u16 type;
        u16 len;
        u8 *buf;
@@ -438,13 +438,13 @@ typedef struct wlan_fr_probereq {
        void *priv;
        /*-- fixed fields -----------*/
        /*-- info elements ----------*/
-       wlan_ie_ssid_t *ssid;
-       wlan_ie_supp_rates_t *supp_rates;
+       struct wlan_ie_ssid *ssid;
+       struct wlan_ie_supp_rates *supp_rates;
 
-} wlan_fr_probereq_t;
+};
 
 /*-- Probe Response -------------------------------*/
-typedef struct wlan_fr_proberesp {
+struct wlan_fr_proberesp {
        u16 type;
        u16 len;
        u8 *buf;
@@ -456,16 +456,16 @@ typedef struct wlan_fr_proberesp {
        u16 *bcn_int;
        u16 *cap_info;
        /*-- info elements ----------*/
-       wlan_ie_ssid_t *ssid;
-       wlan_ie_supp_rates_t *supp_rates;
-       wlan_ie_fh_parms_t *fh_parms;
-       wlan_ie_ds_parms_t *ds_parms;
-       wlan_ie_cf_parms_t *cf_parms;
-       wlan_ie_ibss_parms_t *ibss_parms;
-} wlan_fr_proberesp_t;
+       struct wlan_ie_ssid *ssid;
+       struct wlan_ie_supp_rates *supp_rates;
+       struct wlan_ie_fh_parms *fh_parms;
+       struct wlan_ie_ds_parms *ds_parms;
+       struct wlan_ie_cf_parms *cf_parms;
+       struct wlan_ie_ibss_parms *ibss_parms;
+};
 
 /*-- Authentication -------------------------------*/
-typedef struct wlan_fr_authen {
+struct wlan_fr_authen {
        u16 type;
        u16 len;
        u8 *buf;
@@ -477,12 +477,12 @@ typedef struct wlan_fr_authen {
        u16 *auth_seq;
        u16 *status;
        /*-- info elements ----------*/
-       wlan_ie_challenge_t *challenge;
+       struct wlan_ie_challenge *challenge;
 
-} wlan_fr_authen_t;
+};
 
 /*-- Deauthenication -----------------------------*/
-typedef struct wlan_fr_deauthen {
+struct wlan_fr_deauthen {
        u16 type;
        u16 len;
        u8 *buf;
@@ -494,27 +494,27 @@ typedef struct wlan_fr_deauthen {
 
        /*-- info elements ----------*/
 
-} wlan_fr_deauthen_t;
-
-void wlan_mgmt_encode_beacon(wlan_fr_beacon_t *f);
-void wlan_mgmt_decode_beacon(wlan_fr_beacon_t *f);
-void wlan_mgmt_encode_disassoc(wlan_fr_disassoc_t *f);
-void wlan_mgmt_decode_disassoc(wlan_fr_disassoc_t *f);
-void wlan_mgmt_encode_assocreq(wlan_fr_assocreq_t *f);
-void wlan_mgmt_decode_assocreq(wlan_fr_assocreq_t *f);
-void wlan_mgmt_encode_assocresp(wlan_fr_assocresp_t *f);
-void wlan_mgmt_decode_assocresp(wlan_fr_assocresp_t *f);
-void wlan_mgmt_encode_reassocreq(wlan_fr_reassocreq_t *f);
-void wlan_mgmt_decode_reassocreq(wlan_fr_reassocreq_t *f);
-void wlan_mgmt_encode_reassocresp(wlan_fr_reassocresp_t *f);
-void wlan_mgmt_decode_reassocresp(wlan_fr_reassocresp_t *f);
-void wlan_mgmt_encode_probereq(wlan_fr_probereq_t *f);
-void wlan_mgmt_decode_probereq(wlan_fr_probereq_t *f);
-void wlan_mgmt_encode_proberesp(wlan_fr_proberesp_t *f);
-void wlan_mgmt_decode_proberesp(wlan_fr_proberesp_t *f);
-void wlan_mgmt_encode_authen(wlan_fr_authen_t *f);
-void wlan_mgmt_decode_authen(wlan_fr_authen_t *f);
-void wlan_mgmt_encode_deauthen(wlan_fr_deauthen_t *f);
-void wlan_mgmt_decode_deauthen(wlan_fr_deauthen_t *f);
+};
+
+void wlan_mgmt_encode_beacon(struct wlan_fr_beacon *f);
+void wlan_mgmt_decode_beacon(struct wlan_fr_beacon *f);
+void wlan_mgmt_encode_disassoc(struct wlan_fr_disassoc *f);
+void wlan_mgmt_decode_disassoc(struct wlan_fr_disassoc *f);
+void wlan_mgmt_encode_assocreq(struct wlan_fr_assocreq *f);
+void wlan_mgmt_decode_assocreq(struct wlan_fr_assocreq *f);
+void wlan_mgmt_encode_assocresp(struct wlan_fr_assocresp *f);
+void wlan_mgmt_decode_assocresp(struct wlan_fr_assocresp *f);
+void wlan_mgmt_encode_reassocreq(struct wlan_fr_reassocreq *f);
+void wlan_mgmt_decode_reassocreq(struct wlan_fr_reassocreq *f);
+void wlan_mgmt_encode_reassocresp(struct wlan_fr_reassocresp *f);
+void wlan_mgmt_decode_reassocresp(struct wlan_fr_reassocresp *f);
+void wlan_mgmt_encode_probereq(struct wlan_fr_probereq *f);
+void wlan_mgmt_decode_probereq(struct wlan_fr_probereq *f);
+void wlan_mgmt_encode_proberesp(struct wlan_fr_proberesp *f);
+void wlan_mgmt_decode_proberesp(struct wlan_fr_proberesp *f);
+void wlan_mgmt_encode_authen(struct wlan_fr_authen *f);
+void wlan_mgmt_decode_authen(struct wlan_fr_authen *f);
+void wlan_mgmt_encode_deauthen(struct wlan_fr_deauthen *f);
+void wlan_mgmt_decode_deauthen(struct wlan_fr_deauthen *f);
 
 #endif /* _P80211MGMT_H */