Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 259366
b: refs/heads/master
c: 9152bf2
h: refs/heads/master
v: v3
  • Loading branch information
Roland Vossen authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent 5923e7c commit 509c5ca
Show file tree
Hide file tree
Showing 9 changed files with 125 additions and 121 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: 78539a2147c2cfbb6a0bb091c13c88c1ac4f8ef8
refs/heads/master: 9152bf26bc37b0865c2a0769276b9c07fc4e1f7f
3 changes: 3 additions & 0 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,9 @@ struct dhd_info;
#define DHD_DEL_IF -0xe
#define DHD_BAD_IF -0xf

#define DOT11_BSSTYPE_ANY 2
#define DOT11_MAX_DEFAULT_KEYS 4

enum cust_gpio_modes {
WLAN_RESET_ON,
WLAN_RESET_OFF,
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
#include <dhd_dbg.h>
#include <msgtrace.h>

#define BRCM_OUI "\x00\x10\x18"
#define DOT11_OUI_LEN 3

int dhd_msg_level;
char fw_path[MOD_PARAM_PATHLEN];
char nv_path[MOD_PARAM_PATHLEN];
Expand Down
4 changes: 4 additions & 0 deletions trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ typedef const struct si_pub si_t;
#include <dngl_stats.h>
#include <dhd.h>

#define WPA_OUI "\x00\x50\xF2"
#define DOT11_MNG_RSN_ID 48
#define DOT11_MNG_WPA_ID 221

#define WL_ERROR(fmt, args...) printk(fmt, ##args)
#define WL_TRACE(fmt, args...) no_printk(fmt, ##args)
#define WL_INFORM(fmt, args...) no_printk(fmt, ##args)
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
(void *)&(wlc_hw->regs->fifo64regs[fifonum].dmaxmt) : \
(void *)&(wlc_hw->regs->fifo64regs[fifonum].dmarcv))

#define APHY_SLOT_TIME 9
#define BPHY_SLOT_TIME 20

/*
* The following table lists the buffer memory allocated to xmt fifos in HW.
* the size is in units of 256bytes(one block), total size is HW dependent
Expand Down
64 changes: 64 additions & 0 deletions trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,70 @@
#define WLFEATURE_DISABLE_11N_AMPDU_RX 0x00000040
#define WLFEATURE_DISABLE_11N_GF 0x00000080

#define EDCF_ACI_MASK 0x60
#define EDCF_ACI_SHIFT 5
#define EDCF_ECWMIN_MASK 0x0f
#define EDCF_ECWMAX_SHIFT 4
#define EDCF_AIFSN_MASK 0x0f
#define EDCF_AIFSN_MAX 15
#define EDCF_ECWMAX_MASK 0xf0

#define EDCF_AC_BE_TXOP_STA 0x0000
#define EDCF_AC_BK_TXOP_STA 0x0000
#define EDCF_AC_VO_ACI_STA 0x62
#define EDCF_AC_VO_ECW_STA 0x32
#define EDCF_AC_VI_ACI_STA 0x42
#define EDCF_AC_VI_ECW_STA 0x43
#define EDCF_AC_BK_ECW_STA 0xA4
#define EDCF_AC_VI_TXOP_STA 0x005e
#define EDCF_AC_VO_TXOP_STA 0x002f
#define EDCF_AC_BE_ACI_STA 0x03
#define EDCF_AC_BE_ECW_STA 0xA4
#define EDCF_AC_BK_ACI_STA 0x27
#define EDCF_AC_VO_TXOP_AP 0x002f

#define EDCF_TXOP2USEC(txop) ((txop) << 5)
#define EDCF_ECW2CW(exp) ((1 << (exp)) - 1)

#define APHY_SYMBOL_TIME 4
#define APHY_PREAMBLE_TIME 16
#define APHY_SIGNAL_TIME 4
#define APHY_SIFS_TIME 16
#define APHY_SERVICE_NBITS 16
#define APHY_TAIL_NBITS 6
#define BPHY_SIFS_TIME 10
#define BPHY_PLCP_SHORT_TIME 96

#define PREN_PREAMBLE 24
#define PREN_MM_EXT 12
#define PREN_PREAMBLE_EXT 4

#define DOT11_MAC_HDR_LEN 24
#define DOT11_ACK_LEN 10
#define DOT11_BA_LEN 4
#define DOT11_OFDM_SIGNAL_EXTENSION 6
#define DOT11_MIN_FRAG_LEN 256
#define DOT11_RTS_LEN 16
#define DOT11_CTS_LEN 10
#define DOT11_BA_BITMAP_LEN 128
#define DOT11_MIN_BEACON_PERIOD 1
#define DOT11_MAX_BEACON_PERIOD 0xFFFF
#define DOT11_MAXNUMFRAGS 16
#define DOT11_MAX_FRAG_LEN 2346

#define BPHY_PLCP_TIME 192
#define RIFS_11N_TIME 2

#define WME_VER 1
#define WME_SUBTYPE_PARAM_IE 1
#define WME_TYPE 2
#define WME_OUI "\x00\x50\xf2"

#define AC_BE 0
#define AC_BK 1
#define AC_VI 2
#define AC_VO 3

/*
* driver maintains internal 'tick'(wlc->pub->now) which increments in 1s OS timer(soft
* watchdog) it is not a wall clock and won't increment when driver is in "down" state
Expand Down
30 changes: 30 additions & 0 deletions trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@
#define MAXCOREREV 28 /* max # supported core revisions (0 .. MAXCOREREV - 1) */
#define WLC_MAXMODULES 22 /* max # wlc_module_register() calls */

#define SEQNUM_SHIFT 4
#define AMPDU_DELIMITER_LEN 4
#define SEQNUM_MAX 0x1000

#define APHY_CWMIN 15
#define PHY_CWMAX 1023

#define EDCF_AIFSN_MIN 1
#define FRAGNUM_MASK 0xF

#define WLC_BITSCNT(x) bcm_bitcount((u8 *)&(x), sizeof(u8))

/* Maximum wait time for a MAC suspend */
Expand All @@ -35,6 +45,8 @@
/* transmit buffer max headroom for protocol headers */
#define TXOFF (D11_TXH_LEN + D11_PHY_HDR_LEN)

#define AC_COUNT 4

/* For managing scan result lists */
struct wlc_bss_list {
uint count;
Expand Down Expand Up @@ -342,6 +354,24 @@ struct dumpcb_s {
struct dumpcb_s *next;
};

struct edcf_acparam {
u8 ACI;
u8 ECW;
u16 TXOP;
} __attribute__((packed));
typedef struct edcf_acparam edcf_acparam_t;

struct wme_param_ie {
u8 oui[3];
u8 type;
u8 subtype;
u8 version;
u8 qosinfo;
u8 rsvd;
edcf_acparam_t acparam[AC_COUNT];
} __attribute__((packed));
typedef struct wme_param_ie wme_param_ie_t;

/* virtual interface */
struct wlc_if {
struct wlc_if *next;
Expand Down
17 changes: 17 additions & 0 deletions trunk/drivers/staging/brcm80211/include/bcmwifi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ typedef u16 chanspec_t;

#define WLC_2G_25MHZ_OFFSET 5 /* 2.4GHz band channel offset */

#define MCSSET_LEN 16

#define AC_BITMAP_TST(ab, ac) (((ab) & (1 << (ac))) != 0)

/*
* Verify the chanspec is using a legal set of parameters, i.e. that the
* chanspec specified a band, bw, ctl_sb and channel and that the
Expand Down Expand Up @@ -202,6 +206,17 @@ extern int bcm_mhz2channel(uint freq, uint start_factor);
/* pmkid */
#define MAXPMKID 16

#define DOT11_DEFAULT_RTS_LEN 2347
#define DOT11_DEFAULT_FRAG_LEN 2346

#define DOT11_ICV_AES_LEN 8
#define DOT11_QOS_LEN 2
#define DOT11_IV_MAX_LEN 8
#define DOT11_A4_HDR_LEN 30

#define HT_CAP_RX_STBC_NO 0x0
#define HT_CAP_RX_STBC_ONE_STREAM 0x1

typedef struct _pmkid {
u8 BSSID[ETH_ALEN];
u8 PMKID[WLAN_PMKID_LEN];
Expand All @@ -222,4 +237,6 @@ typedef struct _pmkid_cand_list {
pmkid_cand_t pmkid_cand[1];
} pmkid_cand_list_t;

typedef u8 ac_bitmap_t;

#endif /* _bcmwifi_h_ */
120 changes: 0 additions & 120 deletions trunk/drivers/staging/brcm80211/include/proto/802.11.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,124 +17,4 @@
#ifndef _802_11_H_
#define _802_11_H_

#define MCSSET_LEN 16
#define DOT11_BSSTYPE_ANY 2
#define DOT11_MAX_DEFAULT_KEYS 4
#define WPA_OUI "\x00\x50\xF2"
#define BRCM_OUI "\x00\x10\x18"
#define DOT11_MNG_RSN_ID 48
#define DOT11_MNG_WPA_ID 221
#define DOT11_DEFAULT_RTS_LEN 2347
#define DOT11_DEFAULT_FRAG_LEN 2346
#define DOT11_OUI_LEN 3

#define AC_COUNT 4

#define AC_BITMAP_TST(ab, ac) (((ab) & (1 << (ac))) != 0)

typedef u8 ac_bitmap_t;

struct edcf_acparam {
u8 ACI;
u8 ECW;
u16 TXOP;
} __attribute__((packed));
typedef struct edcf_acparam edcf_acparam_t;

struct wme_param_ie {
u8 oui[3];
u8 type;
u8 subtype;
u8 version;
u8 qosinfo;
u8 rsvd;
edcf_acparam_t acparam[AC_COUNT];
} __attribute__((packed));
typedef struct wme_param_ie wme_param_ie_t;

#define DOT11_MAC_HDR_LEN 24
#define DOT11_ACK_LEN 10
#define DOT11_ICV_AES_LEN 8
#define DOT11_A4_HDR_LEN 30
#define DOT11_QOS_LEN 2
#define DOT11_IV_MAX_LEN 8
#define DOT11_BA_LEN 4
#define DOT11_OFDM_SIGNAL_EXTENSION 6
#define DOT11_MIN_FRAG_LEN 256
#define DOT11_RTS_LEN 16
#define DOT11_CTS_LEN 10
#define DOT11_BA_BITMAP_LEN 128
#define DOT11_MIN_BEACON_PERIOD 1
#define DOT11_MAX_BEACON_PERIOD 0xFFFF
#define DOT11_MAXNUMFRAGS 16
#define DOT11_MAX_FRAG_LEN 2346

#define SEQNUM_SHIFT 4
#define AMPDU_DELIMITER_LEN 4
#define SEQNUM_MAX 0x1000

#define APHY_SLOT_TIME 9
#define BPHY_SLOT_TIME 20
#define APHY_CWMIN 15
#define PHY_CWMAX 1023

#define EDCF_AIFSN_MIN 1
#define BPHY_PLCP_TIME 192

#define APHY_SYMBOL_TIME 4
#define APHY_PREAMBLE_TIME 16
#define APHY_SIGNAL_TIME 4
#define APHY_SIFS_TIME 16
#define APHY_SERVICE_NBITS 16
#define APHY_TAIL_NBITS 6
#define BPHY_SIFS_TIME 10
#define BPHY_PLCP_SHORT_TIME 96

#define PREN_PREAMBLE 24
#define PREN_MM_EXT 12
#define PREN_PREAMBLE_EXT 4

#define FRAGNUM_MASK 0xF

#define RIFS_11N_TIME 2

#define HT_CAP_RX_STBC_NO 0x0

#define EDCF_ACI_MASK 0x60
#define EDCF_ACI_SHIFT 5
#define EDCF_ECWMIN_MASK 0x0f
#define EDCF_ECWMAX_SHIFT 4
#define EDCF_AIFSN_MASK 0x0f
#define EDCF_AIFSN_MAX 15
#define EDCF_ECWMAX_MASK 0xf0

#define EDCF_AC_BE_TXOP_STA 0x0000
#define EDCF_AC_BK_TXOP_STA 0x0000
#define EDCF_AC_VO_ACI_STA 0x62
#define EDCF_AC_VO_ECW_STA 0x32
#define EDCF_AC_VI_ACI_STA 0x42
#define EDCF_AC_VI_ECW_STA 0x43
#define EDCF_AC_BK_ECW_STA 0xA4
#define EDCF_AC_VI_TXOP_STA 0x005e
#define EDCF_AC_VO_TXOP_STA 0x002f
#define EDCF_AC_BE_ACI_STA 0x03
#define EDCF_AC_BE_ECW_STA 0xA4
#define EDCF_AC_BK_ACI_STA 0x27
#define EDCF_AC_VO_TXOP_AP 0x002f

#define EDCF_TXOP2USEC(txop) ((txop) << 5)
#define EDCF_ECW2CW(exp) ((1 << (exp)) - 1)

#define WME_VER 1
#define WME_SUBTYPE_PARAM_IE 1
#define WME_TYPE 2
#define WME_OUI "\x00\x50\xf2"

#define AC_BE 0
#define AC_BK 1
#define AC_VI 2
#define AC_VO 3

#define HT_CAP_RX_STBC_ONE_STREAM 0x1

#endif /* _802_11_H_ */

0 comments on commit 509c5ca

Please sign in to comment.