staging: brcm80211: replaced struct dot11_management_header with ieee80211_mgmt

Code cleanup.

Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/include/proto/802.11.h b/drivers/staging/brcm80211/include/proto/802.11.h
index bb3da205add7aa7dca30ac294b2610681578bbce..5adabfb3e268212c589c622df7d4bd6b5cb1c395 100644 (file)
--- a/drivers/staging/brcm80211/include/proto/802.11.h
+++ b/drivers/staging/brcm80211/include/proto/802.11.h
@@ -51,14 +51,6 @@
 #define DOT11_BA_BITMAP_LEN            128
 #define DOT11_BA_LEN           4
 
-struct dot11_management_header {
-       u16 fc;
-       u16 durid;
-       u8 da[ETH_ALEN];
-       u8 sa[ETH_ALEN];
-       u8 bssid[ETH_ALEN];
-       u16 seq;
-} __attribute__((packed));
 #define        DOT11_MGMT_HDR_LEN      24
 
 struct dot11_bcn_prb {

diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index f3b1b12b190000900ccb96f69c2d60c8a3ed65a6..755b73d604a1f0da67ed1db9bb7dce11e5ffe6aa 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -1744,7 +1744,6 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
        ASSERT(sizeof(d11rxhdr_t) == RXHDR_LEN);
        ASSERT(sizeof(struct ieee80211_hdr) == DOT11_A4_HDR_LEN);
        ASSERT(sizeof(struct ieee80211_rts) == DOT11_RTS_LEN);
-       ASSERT(sizeof(struct dot11_management_header) == DOT11_MGMT_HDR_LEN);
        ASSERT(sizeof(struct dot11_bcn_prb) == DOT11_BCN_PRB_LEN);
        ASSERT(sizeof(tx_status_t) == TXSTATUS_LEN);
        ASSERT(sizeof(ht_cap_ie_t) == HT_CAP_IE_LEN);
@@ -7625,7 +7624,7 @@ wlc_bcn_prb_template(struct wlc_info *wlc, uint type, ratespec_t bcn_rspec,
 {
        static const u8 ether_bcast[ETH_ALEN] = {255, 255, 255, 255, 255, 255};
        cck_phy_hdr_t *plcp;
-       struct dot11_management_header *h;
+       struct ieee80211_mgmt *h;
        int hdr_len, body_len;
 
        ASSERT(*len >= 142);
@@ -7658,12 +7657,12 @@ wlc_bcn_prb_template(struct wlc_info *wlc, uint type, ratespec_t bcn_rspec,
                wlc_beacon_phytxctl_txant_upd(wlc, bcn_rspec);
 
        if (MBSS_BCN_ENAB(cfg) && type == FC_BEACON)
-               h = (struct dot11_management_header *)&plcp[0];
+               h = (struct ieee80211_mgmt *)&plcp[0];
        else
-               h = (struct dot11_management_header *)&plcp[1];
+               h = (struct ieee80211_mgmt *)&plcp[1];
 
        /* fill in 802.11 header */
-       h->fc = htol16((u16) type);
+       h->frame_control = htol16((u16) type);
 
        /* DUR is 0 for multicast bcn, or filled in by MAC for prb resp */
        /* A1 filled in by MAC for prb resp, broadcast for bcn */