Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b745b6bb authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: deleted brcmsmac/cfg.h and brcmsmac/bsscfg.h 



Code cleanup. Moved used sections to other source files.

Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 383aab51

drivers/staging/brcm80211/brcmsmac/alloc.c

+0 −2
Original line number Diff line number Diff line
@@ -23,13 +23,11 @@ 


#include "d11.h"

#include "types.h"

#include "cfg.h"

#include "scb.h"

#include "pub.h"

#include "key.h"

#include "alloc.h"

#include "rate.h"

#include "bsscfg.h"

#include "phy/phy_hal.h"

#include "channel.h"

#include "main.h"

drivers/staging/brcm80211/brcmsmac/ampdu.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <d11.h>



#include "types.h"

#include "cfg.h"

#include "rate.h"

#include "scb.h"

#include "pub.h"

drivers/staging/brcm80211/brcmsmac/antsel.c

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include <cfg.h>



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/pci.h>

drivers/staging/brcm80211/brcmsmac/bottom_mac.c

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include "types.h"

#include "pmu.h"

#include "d11.h"

#include "cfg.h"

#include "rate.h"

#include "scb.h"

#include "pub.h"

drivers/staging/brcm80211/brcmsmac/bsscfg.h

deleted100644 → 0
+0 −135
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2010 Broadcom Corporation

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

 * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#ifndef _BRCM_BSSCFG_H_

#define _BRCM_BSSCFG_H_



/* Check if a particular BSS config is AP or STA */

#define BSSCFG_AP(cfg)		(0)

#define BSSCFG_STA(cfg)		(1)



#define BSSCFG_IBSS(cfg)	(!(cfg)->BSS)



#define NTXRATE			64	/* # tx MPDUs rate is reported for */

#define MAXMACLIST		64	/* max # source MAC matches */

#define BCN_TEMPLATE_COUNT 	2



/* Iterator for "associated" STA bss configs:

   (struct wlc_info *wlc, int idx, struct wlc_bsscfg *cfg) */

#define FOREACH_AS_STA(wlc, idx, cfg) \

	for (idx = 0; (int) idx < WLC_MAXBSSCFG; idx++) \

		if ((cfg = (wlc)->bsscfg[idx]) && BSSCFG_STA(cfg) && cfg->associated)



/* As above for all non-NULL BSS configs */

#define FOREACH_BSS(wlc, idx, cfg) \

	for (idx = 0; (int) idx < WLC_MAXBSSCFG; idx++) \

		if ((cfg = (wlc)->bsscfg[idx]))



/* BSS configuration state */

struct wlc_bsscfg {

	struct wlc_info *wlc;	/* wlc to which this bsscfg belongs to. */

	bool up;		/* is this configuration up operational */

	bool enable;		/* is this configuration enabled */

	bool associated;	/* is BSS in ASSOCIATED state */

	bool BSS;		/* infraustructure or adhac */

	bool dtim_programmed;



	u8 SSID_len;		/* the length of SSID */

	u8 SSID[IEEE80211_MAX_SSID_LEN]; /* SSID string */

	struct scb *bcmc_scb[MAXBANDS];	/* one bcmc_scb per band */

	s8 _idx;		/* the index of this bsscfg,

				 * assigned at wlc_bsscfg_alloc()

				 */

	/* MAC filter */

	uint nmac;		/* # of entries on maclist array */

	int macmode;		/* allow/deny stations on maclist array */

	struct ether_addr *maclist;	/* list of source MAC addrs to match */



	/* security */

	u32 wsec;		/* wireless security bitvec */

	s16 auth;		/* 802.11 authentication: Open, Shared Key, WPA */

	s16 openshared;	/* try Open auth first, then Shared Key */

	bool wsec_restrict;	/* drop unencrypted packets if wsec is enabled */

	bool eap_restrict;	/* restrict data until 802.1X auth succeeds */

	u16 WPA_auth;	/* WPA: authenticated key management */

	bool wpa2_preauth;	/* default is true, wpa_cap sets value */

	bool wsec_portopen;	/* indicates keys are plumbed */

	wsec_iv_t wpa_none_txiv;	/* global txiv for WPA_NONE, tkip and aes */

	int wsec_index;		/* 0-3: default tx key, -1: not set */

	wsec_key_t *bss_def_keys[WLC_DEFAULT_KEYS];	/* default key storage */



	/* TKIP countermeasures */

	bool tkip_countermeasures;	/* flags TKIP no-assoc period */

	u32 tk_cm_dt;	/* detect timer */

	u32 tk_cm_bt;	/* blocking timer */

	u32 tk_cm_bt_tmstmp;	/* Timestamp when TKIP BT is activated */

	bool tk_cm_activate;	/* activate countermeasures after EAPOL-Key sent */



	u8 BSSID[ETH_ALEN];	/* BSSID (associated) */

	u8 cur_etheraddr[ETH_ALEN];	/* h/w address */

	u16 bcmc_fid;	/* the last BCMC FID queued to TX_BCMC_FIFO */

	u16 bcmc_fid_shm;	/* the last BCMC FID written to shared mem */



	u32 flags;		/* WLC_BSSCFG flags; see below */



	u8 *bcn;		/* AP beacon */

	uint bcn_len;		/* AP beacon length */

	bool ar_disassoc;	/* disassociated in associated recreation */



	int auth_atmptd;	/* auth type (open/shared) attempted */



	pmkid_cand_t pmkid_cand[MAXPMKID];	/* PMKID candidate list */

	uint npmkid_cand;	/* num PMKID candidates */

	pmkid_t pmkid[MAXPMKID];	/* PMKID cache */

	uint npmkid;		/* num cached PMKIDs */



	wlc_bss_info_t *current_bss;	/* BSS parms in ASSOCIATED state */



	/* PM states */

	bool PMawakebcn;	/* bcn recvd during current waking state */

	bool PMpending;		/* waiting for tx status with PM indicated set */

	bool priorPMstate;	/* Detecting PM state transitions */

	bool PSpoll;		/* whether there is an outstanding PS-Poll frame */



	/* BSSID entry in RCMTA, use the wsec key management infrastructure to

	 * manage the RCMTA entries.

	 */

	wsec_key_t *rcmta;



	/* 'unique' ID of this bsscfg, assigned at bsscfg allocation */

	u16 ID;



	uint txrspecidx;	/* index into tx rate circular buffer */

	ratespec_t txrspec[NTXRATE][2];	/* circular buffer of prev MPDUs tx rates */

};



#define WLC_BSSCFG_11N_DISABLE	0x1000	/* Do not advertise .11n IEs for this BSS */

#define WLC_BSSCFG_HW_BCN	0x20	/* The BSS is generating beacons in HW */



#define HWBCN_ENAB(cfg)		(((cfg)->flags & WLC_BSSCFG_HW_BCN) != 0)

#define HWPRB_ENAB(cfg)		(((cfg)->flags & WLC_BSSCFG_HW_PRB) != 0)



/* Extend N_ENAB to per-BSS */

#define BSS_N_ENAB(wlc, cfg) \

	(N_ENAB((wlc)->pub) && !((cfg)->flags & WLC_BSSCFG_11N_DISABLE))



#define MBSS_BCN_ENAB(cfg)       0

#define MBSS_PRB_ENAB(cfg)       0

#define SOFTBCN_ENAB(pub)    (0)

#define SOFTPRB_ENAB(pub)    (0)

#define wlc_bsscfg_tx_check(a) do { } while (0);



#endif				/* _BRCM_BSSCFG_H_ */