forked from Minki/linux
staging: brcm80211: remove duplicated file, bcmutils.c
Remove duplicated file, bcmutils.c under brcm80211/brcmfmac. brcm80211/util/bcmutils.c will be shared between softmac & fullmac. Makefile, and some other files are also modified accordingly Signed-off-by: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
nohee ko
Greg Kroah-Hartman
parent
9b24b8f941
commit
ea3b8a2810
@ -41,7 +41,7 @@ ccflags-y := \
|
||||
-Idrivers/staging/brcm80211/include \
|
||||
-Idrivers/staging/brcm80211/util
|
||||
|
||||
DHDOFILES = dhd_linux.o ../util/linux_osl.o bcmutils.o dhd_common.o dhd_custom_gpio.o \
|
||||
DHDOFILES = dhd_linux.o ../util/linux_osl.o ../util/bcmutils.o dhd_common.o dhd_custom_gpio.o \
|
||||
wl_iw.o wl_cfg80211.o ../util/siutils.o ../util/sbutils.o ../util/aiutils.o ../util/hndpmu.o ../util/bcmwifi.o dhd_sdio.o \
|
||||
dhd_linux_sched.o dhd_cdc.o bcmsdh_sdmmc.o bcmsdh.o bcmsdh_linux.o \
|
||||
bcmsdh_sdmmc_linux.o
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -967,7 +967,7 @@ void print_buf(void *pbuf, int len, int bytes_per_line)
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
#define strtoul(nptr, endptr, base) bcm_strtoul((nptr), (endptr), (base))
|
||||
#define strtoul(nptr, endptr, base) simple_strtoul((nptr), (endptr), (base))
|
||||
|
||||
/* Convert user's input in hex pattern to byte-size mask */
|
||||
static int wl_pattern_atoh(char *src, char *dst)
|
||||
|
||||
@ -2397,15 +2397,15 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, u32 actionid,
|
||||
{
|
||||
*(char *)arg = 0;
|
||||
|
||||
bcmstrcat(arg, "\nFunc 0\n");
|
||||
strcat(arg, "\nFunc 0\n");
|
||||
bcmsdh_cis_read(bus->sdh, 0x10,
|
||||
(u8 *) arg + strlen(arg),
|
||||
SBSDIO_CIS_SIZE_LIMIT);
|
||||
bcmstrcat(arg, "\nFunc 1\n");
|
||||
strcat(arg, "\nFunc 1\n");
|
||||
bcmsdh_cis_read(bus->sdh, 0x11,
|
||||
(u8 *) arg + strlen(arg),
|
||||
SBSDIO_CIS_SIZE_LIMIT);
|
||||
bcmstrcat(arg, "\nFunc 2\n");
|
||||
strcat(arg, "\nFunc 2\n");
|
||||
bcmsdh_cis_read(bus->sdh, 0x12,
|
||||
(u8 *) arg + strlen(arg),
|
||||
SBSDIO_CIS_SIZE_LIMIT);
|
||||
|
||||
@ -21,36 +21,6 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifdef BRCM_FULLMAC
|
||||
/* ctype replacement */
|
||||
#define _BCM_U 0x01 /* upper */
|
||||
#define _BCM_L 0x02 /* lower */
|
||||
#define _BCM_D 0x04 /* digit */
|
||||
#define _BCM_C 0x08 /* cntrl */
|
||||
#define _BCM_P 0x10 /* punct */
|
||||
#define _BCM_S 0x20 /* white space (space/lf/tab) */
|
||||
#define _BCM_X 0x40 /* hex digit */
|
||||
#define _BCM_SP 0x80 /* hard space (0x20) */
|
||||
|
||||
extern const unsigned char bcm_ctype[];
|
||||
#define bcm_ismask(x) (bcm_ctype[(int)(unsigned char)(x)])
|
||||
|
||||
#define bcm_isalnum(c) ((bcm_ismask(c)&(_BCM_U|_BCM_L|_BCM_D)) != 0)
|
||||
#define bcm_isalpha(c) ((bcm_ismask(c)&(_BCM_U|_BCM_L)) != 0)
|
||||
#define bcm_iscntrl(c) ((bcm_ismask(c)&(_BCM_C)) != 0)
|
||||
#define bcm_isdigit(c) ((bcm_ismask(c)&(_BCM_D)) != 0)
|
||||
#define bcm_isgraph(c) ((bcm_ismask(c)&(_BCM_P|_BCM_U|_BCM_L|_BCM_D)) != 0)
|
||||
#define bcm_islower(c) ((bcm_ismask(c)&(_BCM_L)) != 0)
|
||||
#define bcm_isprint(c) \
|
||||
((bcm_ismask(c)&(_BCM_P|_BCM_U|_BCM_L|_BCM_D|_BCM_SP)) != 0)
|
||||
#define bcm_ispunct(c) ((bcm_ismask(c)&(_BCM_P)) != 0)
|
||||
#define bcm_isspace(c) ((bcm_ismask(c)&(_BCM_S)) != 0)
|
||||
#define bcm_isupper(c) ((bcm_ismask(c)&(_BCM_U)) != 0)
|
||||
#define bcm_isxdigit(c) ((bcm_ismask(c)&(_BCM_D|_BCM_X)) != 0)
|
||||
#define bcm_tolower(c) (bcm_isupper((c)) ? ((c) + 'a' - 'A') : (c))
|
||||
#define bcm_toupper(c) (bcm_islower((c)) ? ((c) + 'A' - 'a') : (c))
|
||||
#endif /* BRCM_FULLMAC */
|
||||
|
||||
/* Buffer structure for collecting string-formatted data
|
||||
* using bcm_bprintf() API.
|
||||
* Use bcm_binit() to initialize before use
|
||||
@ -150,17 +120,11 @@ extern "C" {
|
||||
#else
|
||||
extern void pktq_pflush(osl_t *osh, struct pktq *pq, int prec,
|
||||
bool dir, ifpkt_cb_t fn, int arg);
|
||||
#endif
|
||||
#ifdef BRCM_FULLMAC
|
||||
/* Remove a specified packet from its queue */
|
||||
extern bool pktq_pdel(struct pktq *pq, void *p, int prec);
|
||||
#endif /* BRCM_FULLMAC */
|
||||
|
||||
/* operations on a set of precedences in packet queue */
|
||||
|
||||
#ifdef BRCM_FULLMAC
|
||||
extern int pktq_mlen(struct pktq *pq, uint prec_bmp);
|
||||
#endif /* BRCM_FULLMAC */
|
||||
extern void *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out);
|
||||
|
||||
/* operations on packet queue as a whole */
|
||||
@ -180,11 +144,6 @@ extern "C" {
|
||||
|
||||
extern void pktq_init(struct pktq *pq, int num_prec, int max_len);
|
||||
/* prec_out may be NULL if caller is not interested in return value */
|
||||
#ifdef BRCM_FULLMAC
|
||||
extern void *pktq_deq(struct pktq *pq, int *prec_out);
|
||||
extern void *pktq_deq_tail(struct pktq *pq, int *prec_out);
|
||||
extern void *pktq_peek(struct pktq *pq, int *prec_out);
|
||||
#endif /* BRCM_FULLMAC */
|
||||
extern void *pktq_peek_tail(struct pktq *pq, int *prec_out);
|
||||
#ifdef BRCM_FULLMAC
|
||||
extern void pktq_flush(osl_t *osh, struct pktq *pq, bool dir);
|
||||
@ -195,14 +154,9 @@ extern "C" {
|
||||
|
||||
/* externs */
|
||||
/* packet */
|
||||
#ifdef BRCM_FULLMAC
|
||||
extern uint pktcopy(osl_t *osh, void *p, uint offset, int len,
|
||||
unsigned char *buf);
|
||||
extern uint pktfrombuf(osl_t *osh, void *p, uint offset, int len,
|
||||
unsigned char *buf);
|
||||
extern void *pktlast(osl_t *osh, void *p);
|
||||
extern uint pktsegcnt(osl_t *osh, void *p);
|
||||
#endif /* BRCM_FULLMAC */
|
||||
extern uint pkttotlen(osl_t *osh, void *p);
|
||||
|
||||
/* Get priority from a packet and pass it back in scb (or equiv) */
|
||||
@ -212,39 +166,18 @@ extern "C" {
|
||||
#define PKTPRIO_UPD 0x400 /* DSCP used to update VLAN prio */
|
||||
#define PKTPRIO_DSCP 0x800 /* DSCP prio found */
|
||||
|
||||
#ifdef BRCM_FULLMAC
|
||||
/* string */
|
||||
extern int BCMROMFN(bcm_atoi) (char *s);
|
||||
extern unsigned long BCMROMFN(bcm_strtoul) (char *cp, char **endp, uint base);
|
||||
extern char *BCMROMFN(bcmstrstr) (char *haystack, char *needle);
|
||||
extern char *BCMROMFN(bcmstrcat) (char *dest, const char *src);
|
||||
extern char *BCMROMFN(bcmstrncat) (char *dest, const char *src,
|
||||
uint size);
|
||||
extern unsigned long wchar2ascii(char *abuf, unsigned short *wbuf, unsigned short wbuflen,
|
||||
unsigned long abuflen);
|
||||
char *bcmstrtok(char **string, const char *delimiters, char *tokdelim);
|
||||
int bcmstricmp(const char *s1, const char *s2);
|
||||
int bcmstrnicmp(const char *s1, const char *s2, int cnt);
|
||||
#endif
|
||||
/* ethernet address */
|
||||
extern char *bcm_ether_ntoa(const struct ether_addr *ea, char *buf);
|
||||
extern int BCMROMFN(bcm_ether_atoe) (char *p, struct ether_addr *ea);
|
||||
extern int bcm_ether_atoe(char *p, struct ether_addr *ea);
|
||||
|
||||
/* ip address */
|
||||
struct ipv4_addr;
|
||||
extern char *bcm_ip_ntoa(struct ipv4_addr *ia, char *buf);
|
||||
|
||||
#ifdef BRCM_FULLMAC
|
||||
/* delay */
|
||||
extern void bcm_mdelay(uint ms);
|
||||
#endif
|
||||
/* variable access */
|
||||
extern char *getvar(char *vars, const char *name);
|
||||
extern int getintvar(char *vars, const char *name);
|
||||
#ifdef BRCM_FULLMAC
|
||||
extern int getintvararray(char *vars, const char *name, u8 index);
|
||||
extern uint getgpiopin(char *vars, char *pin_name, uint def_pin);
|
||||
#endif
|
||||
#ifdef BCMDBG
|
||||
extern void prpkt(const char *msg, osl_t *osh, void *p0);
|
||||
#endif /* BCMDBG */
|
||||
@ -258,11 +191,6 @@ extern "C" {
|
||||
#define bcmprinttslogs()
|
||||
#define bcmprinttstamp(us)
|
||||
|
||||
#ifdef BRCM_FULLLMAC
|
||||
extern char *bcm_nvram_vars(uint *length);
|
||||
extern int bcm_nvram_cache(void *sih);
|
||||
#endif
|
||||
|
||||
/* Support for sharing code across in-driver iovar implementations.
|
||||
* The intent is that a driver use this structure to map iovar names
|
||||
* to its (private) iovar identifiers, and the lookup function to
|
||||
@ -293,18 +221,10 @@ extern "C" {
|
||||
|
||||
/* flags are per-driver based on driver attributes */
|
||||
|
||||
#ifdef BRCM_FULLMAC
|
||||
extern const bcm_iovar_t *bcm_iovar_lookup(const bcm_iovar_t *table,
|
||||
const char *name);
|
||||
#endif
|
||||
extern int bcm_iovar_lencheck(const bcm_iovar_t *table, void *arg,
|
||||
int len, bool set);
|
||||
#ifdef BRCM_FULLMAC
|
||||
#if defined(BCMDBG)
|
||||
extern int bcm_format_ssid(char *buf, const unsigned char ssid[],
|
||||
uint ssid_len);
|
||||
#endif
|
||||
#endif /* BRCM_FULLMAC */
|
||||
|
||||
/* Base type definitions */
|
||||
#define IOVT_VOID 0 /* no value (implictly set only) */
|
||||
@ -549,40 +469,21 @@ extern "C" {
|
||||
|
||||
/* externs */
|
||||
/* crc */
|
||||
extern u8 BCMROMFN(hndcrc8) (u8 *p, uint nbytes, u8 crc);
|
||||
extern u16 BCMROMFN(hndcrc16) (u8 *p, uint nbytes, u16 crc);
|
||||
extern u8 hndcrc8(u8 *p, uint nbytes, u8 crc);
|
||||
extern u16 hndcrc16(u8 *p, uint nbytes, u16 crc);
|
||||
/* format/print */
|
||||
#if defined(BCMDBG)
|
||||
extern int bcm_format_flags(const bcm_bit_desc_t *bd, u32 flags,
|
||||
char *buf, int len);
|
||||
extern int bcm_format_hex(char *str, const void *bytes, int len);
|
||||
#endif
|
||||
#ifdef BRCM_FULLMAC
|
||||
#ifdef BCMDBG
|
||||
extern void deadbeef(void *p, uint len);
|
||||
#endif
|
||||
extern const char *bcm_crypto_algo_name(uint algo);
|
||||
#endif /* BRCM_FULLMAC */
|
||||
extern char *bcm_chipname(uint chipid, char *buf, uint len);
|
||||
#ifdef BRCM_FULLMAC
|
||||
extern char *bcm_brev_str(u32 brev, char *buf);
|
||||
extern void printbig(char *buf);
|
||||
#endif /* BRCM_FULLMAC */
|
||||
extern void prhex(const char *msg, unsigned char *buf, uint len);
|
||||
|
||||
#ifdef BRCM_FULLMAC
|
||||
/* IE parsing */
|
||||
extern bcm_tlv_t *BCMROMFN(bcm_next_tlv) (bcm_tlv_t *elt, int *buflen);
|
||||
extern bcm_tlv_t *BCMROMFN(bcm_parse_ordered_tlvs) (void *buf,
|
||||
int buflen,
|
||||
uint key);
|
||||
#endif
|
||||
extern bcm_tlv_t *BCMROMFN(bcm_parse_tlvs) (void *buf, int buflen,
|
||||
extern bcm_tlv_t *bcm_parse_tlvs(void *buf, int buflen,
|
||||
uint key);
|
||||
#ifdef BRCM_FULLMAC
|
||||
/* bcmerror */
|
||||
extern const char *bcmerrorstr(int bcmerror);
|
||||
#endif
|
||||
|
||||
/* multi-bool data type: set of bools, mbool is true if any is set */
|
||||
typedef u32 mbool;
|
||||
@ -591,11 +492,9 @@ extern "C" {
|
||||
#define mboolisset(mb, bit) (((mb) & (bit)) != 0) /* TRUE if one bool is set */
|
||||
#define mboolmaskset(mb, mask, val) ((mb) = (((mb) & ~(mask)) | (val)))
|
||||
|
||||
#ifdef BRCM_FULLMAC
|
||||
/* power conversion */
|
||||
extern u16 BCMROMFN(bcm_qdbm_to_mw) (u8 qdbm);
|
||||
extern u8 BCMROMFN(bcm_mw_to_qdbm) (u16 mw);
|
||||
#endif
|
||||
extern u16 bcm_qdbm_to_mw(u8 qdbm);
|
||||
extern u8 bcm_mw_to_qdbm(u16 mw);
|
||||
|
||||
/* generic datastruct to help dump routines */
|
||||
struct fielddesc {
|
||||
@ -604,25 +503,15 @@ extern "C" {
|
||||
u32 len;
|
||||
};
|
||||
|
||||
#ifdef BRCM_FULLMAC
|
||||
extern void bcm_binit(struct bcmstrbuf *b, char *buf, uint size);
|
||||
extern int bcm_bprintf(struct bcmstrbuf *b, const char *fmt, ...);
|
||||
extern void bcm_inc_bytes(unsigned char *num, int num_bytes, u8 amount);
|
||||
extern int bcm_cmp_bytes(unsigned char *arg1, unsigned char *arg2, u8 nbytes);
|
||||
extern void bcm_print_bytes(char *name, const unsigned char *cdata, int len);
|
||||
#endif
|
||||
|
||||
typedef u32(*bcmutl_rdreg_rtn) (void *arg0, uint arg1,
|
||||
u32 offset);
|
||||
#ifdef BRCM_FULLMAC
|
||||
extern uint bcmdumpfields(bcmutl_rdreg_rtn func_ptr, void *arg0,
|
||||
uint arg1, struct fielddesc *str, char *buf,
|
||||
u32 bufsize);
|
||||
|
||||
extern uint bcm_mkiovar(char *name, char *data, uint datalen, char *buf,
|
||||
uint len);
|
||||
#endif
|
||||
extern uint BCMROMFN(bcm_bitcount) (u8 *bitmap, uint bytelength);
|
||||
extern uint bcm_bitcount(u8 *bitmap, uint bytelength);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@ -28,10 +28,39 @@
|
||||
#include <bcmendian.h>
|
||||
#include <bcmdevs.h>
|
||||
#include <proto/ethernet.h>
|
||||
#include <proto/vlan.h>
|
||||
#include <proto/bcmip.h>
|
||||
#include <proto/802.1d.h>
|
||||
#include <proto/802.11.h>
|
||||
|
||||
|
||||
/* copy a buffer into a pkt buffer chain */
|
||||
uint pktfrombuf(osl_t *osh, void *p, uint offset, int len, unsigned char *buf)
|
||||
{
|
||||
uint n, ret = 0;
|
||||
|
||||
/* skip 'offset' bytes */
|
||||
for (; p && offset; p = PKTNEXT(p)) {
|
||||
if (offset < (uint) PKTLEN(p))
|
||||
break;
|
||||
offset -= PKTLEN(p);
|
||||
}
|
||||
|
||||
if (!p)
|
||||
return 0;
|
||||
|
||||
/* copy the data */
|
||||
for (; p && len; p = PKTNEXT(p)) {
|
||||
n = min((uint) PKTLEN(p) - offset, (uint) len);
|
||||
bcopy(buf, PKTDATA(p) + offset, n);
|
||||
buf += n;
|
||||
len -= n;
|
||||
ret += n;
|
||||
offset = 0;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
/* return total length of buffer chain */
|
||||
uint BCMFASTPATH pkttotlen(osl_t *osh, void *p)
|
||||
{
|
||||
@ -157,6 +186,34 @@ void *BCMFASTPATH pktq_pdeq_tail(struct pktq *pq, int prec)
|
||||
return p;
|
||||
}
|
||||
|
||||
#ifdef BRCM_FULLMAC
|
||||
void pktq_pflush(osl_t *osh, struct pktq *pq, int prec, bool dir)
|
||||
{
|
||||
struct pktq_prec *q;
|
||||
void *p;
|
||||
|
||||
q = &pq->q[prec];
|
||||
p = q->head;
|
||||
while (p) {
|
||||
q->head = PKTLINK(p);
|
||||
PKTSETLINK(p, NULL);
|
||||
PKTFREE(osh, p, dir);
|
||||
q->len--;
|
||||
pq->len--;
|
||||
p = q->head;
|
||||
}
|
||||
ASSERT(q->len == 0);
|
||||
q->tail = NULL;
|
||||
}
|
||||
|
||||
void pktq_flush(osl_t *osh, struct pktq *pq, bool dir)
|
||||
{
|
||||
int prec;
|
||||
for (prec = 0; prec < pq->num_prec; prec++)
|
||||
pktq_pflush(osh, pq, prec, dir);
|
||||
ASSERT(pq->len == 0);
|
||||
}
|
||||
#else /* !BRCM_FULLMAC */
|
||||
void
|
||||
pktq_pflush(osl_t *osh, struct pktq *pq, int prec, bool dir, ifpkt_cb_t fn,
|
||||
int arg)
|
||||
@ -190,6 +247,16 @@ pktq_pflush(osl_t *osh, struct pktq *pq, int prec, bool dir, ifpkt_cb_t fn,
|
||||
}
|
||||
}
|
||||
|
||||
void pktq_flush(osl_t *osh, struct pktq *pq, bool dir, ifpkt_cb_t fn, int arg)
|
||||
{
|
||||
int prec;
|
||||
for (prec = 0; prec < pq->num_prec; prec++)
|
||||
pktq_pflush(osh, pq, prec, dir, fn, arg);
|
||||
if (fn == NULL)
|
||||
ASSERT(pq->len == 0);
|
||||
}
|
||||
#endif /* BRCM_FULLMAC */
|
||||
|
||||
void pktq_init(struct pktq *pq, int num_prec, int max_len)
|
||||
{
|
||||
int prec;
|
||||
@ -225,15 +292,19 @@ void *pktq_peek_tail(struct pktq *pq, int *prec_out)
|
||||
return pq->q[prec].tail;
|
||||
}
|
||||
|
||||
void pktq_flush(osl_t *osh, struct pktq *pq, bool dir, ifpkt_cb_t fn, int arg)
|
||||
/* Return sum of lengths of a specific set of precedences */
|
||||
int pktq_mlen(struct pktq *pq, uint prec_bmp)
|
||||
{
|
||||
int prec;
|
||||
for (prec = 0; prec < pq->num_prec; prec++)
|
||||
pktq_pflush(osh, pq, prec, dir, fn, arg);
|
||||
if (fn == NULL)
|
||||
ASSERT(pq->len == 0);
|
||||
}
|
||||
int prec, len;
|
||||
|
||||
len = 0;
|
||||
|
||||
for (prec = 0; prec <= pq->hi_prec; prec++)
|
||||
if (prec_bmp & (1 << prec))
|
||||
len += pq->q[prec].len;
|
||||
|
||||
return len;
|
||||
}
|
||||
/* Priority dequeue from a specific set of precedences */
|
||||
void *BCMFASTPATH pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out)
|
||||
{
|
||||
@ -274,7 +345,7 @@ void *BCMFASTPATH pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out)
|
||||
}
|
||||
|
||||
/* parse a xx:xx:xx:xx:xx:xx format ethernet address */
|
||||
int BCMROMFN(bcm_ether_atoe) (char *p, struct ether_addr *ea)
|
||||
int bcm_ether_atoe(char *p, struct ether_addr *ea)
|
||||
{
|
||||
int i = 0;
|
||||
|
||||
@ -317,9 +388,12 @@ char *getvar(char *vars, const char *name)
|
||||
while (*s++)
|
||||
;
|
||||
}
|
||||
|
||||
#ifdef BRCM_FULLMAC
|
||||
return NULL;
|
||||
#else
|
||||
/* then query nvram */
|
||||
return nvram_get(name);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@ -351,6 +425,118 @@ void prpkt(const char *msg, osl_t *osh, void *p0)
|
||||
}
|
||||
#endif /* defined(BCMDBG) */
|
||||
|
||||
/* Takes an Ethernet frame and sets out-of-bound PKTPRIO.
|
||||
* Also updates the inplace vlan tag if requested.
|
||||
* For debugging, it returns an indication of what it did.
|
||||
*/
|
||||
uint pktsetprio(void *pkt, bool update_vtag)
|
||||
{
|
||||
struct ether_header *eh;
|
||||
struct ethervlan_header *evh;
|
||||
u8 *pktdata;
|
||||
int priority = 0;
|
||||
int rc = 0;
|
||||
|
||||
pktdata = (u8 *) PKTDATA(pkt);
|
||||
ASSERT(IS_ALIGNED((uintptr) pktdata, sizeof(u16)));
|
||||
|
||||
eh = (struct ether_header *)pktdata;
|
||||
|
||||
if (ntoh16(eh->ether_type) == ETHER_TYPE_8021Q) {
|
||||
u16 vlan_tag;
|
||||
int vlan_prio, dscp_prio = 0;
|
||||
|
||||
evh = (struct ethervlan_header *)eh;
|
||||
|
||||
vlan_tag = ntoh16(evh->vlan_tag);
|
||||
vlan_prio = (int)(vlan_tag >> VLAN_PRI_SHIFT) & VLAN_PRI_MASK;
|
||||
|
||||
if (ntoh16(evh->ether_type) == ETHER_TYPE_IP) {
|
||||
u8 *ip_body =
|
||||
pktdata + sizeof(struct ethervlan_header);
|
||||
u8 tos_tc = IP_TOS(ip_body);
|
||||
dscp_prio = (int)(tos_tc >> IPV4_TOS_PREC_SHIFT);
|
||||
}
|
||||
|
||||
/* DSCP priority gets precedence over 802.1P (vlan tag) */
|
||||
if (dscp_prio != 0) {
|
||||
priority = dscp_prio;
|
||||
rc |= PKTPRIO_VDSCP;
|
||||
} else {
|
||||
priority = vlan_prio;
|
||||
rc |= PKTPRIO_VLAN;
|
||||
}
|
||||
/*
|
||||
* If the DSCP priority is not the same as the VLAN priority,
|
||||
* then overwrite the priority field in the vlan tag, with the
|
||||
* DSCP priority value. This is required for Linux APs because
|
||||
* the VLAN driver on Linux, overwrites the skb->priority field
|
||||
* with the priority value in the vlan tag
|
||||
*/
|
||||
if (update_vtag && (priority != vlan_prio)) {
|
||||
vlan_tag &= ~(VLAN_PRI_MASK << VLAN_PRI_SHIFT);
|
||||
vlan_tag |= (u16) priority << VLAN_PRI_SHIFT;
|
||||
evh->vlan_tag = hton16(vlan_tag);
|
||||
rc |= PKTPRIO_UPD;
|
||||
}
|
||||
} else if (ntoh16(eh->ether_type) == ETHER_TYPE_IP) {
|
||||
u8 *ip_body = pktdata + sizeof(struct ether_header);
|
||||
u8 tos_tc = IP_TOS(ip_body);
|
||||
priority = (int)(tos_tc >> IPV4_TOS_PREC_SHIFT);
|
||||
rc |= PKTPRIO_DSCP;
|
||||
}
|
||||
|
||||
ASSERT(priority >= 0 && priority <= MAXPRIO);
|
||||
PKTSETPRIO(pkt, priority);
|
||||
return rc | priority;
|
||||
}
|
||||
|
||||
static char bcm_undeferrstr[BCME_STRLEN];
|
||||
|
||||
static const char *bcmerrorstrtable[] = BCMERRSTRINGTABLE;
|
||||
|
||||
/* Convert the error codes into related error strings */
|
||||
const char *bcmerrorstr(int bcmerror)
|
||||
{
|
||||
/* check if someone added a bcmerror code but
|
||||
forgot to add errorstring */
|
||||
ASSERT(ABS(BCME_LAST) == (ARRAY_SIZE(bcmerrorstrtable) - 1));
|
||||
|
||||
if (bcmerror > 0 || bcmerror < BCME_LAST) {
|
||||
snprintf(bcm_undeferrstr, BCME_STRLEN, "Undefined error %d",
|
||||
bcmerror);
|
||||
return bcm_undeferrstr;
|
||||
}
|
||||
|
||||
ASSERT(strlen(bcmerrorstrtable[-bcmerror]) < BCME_STRLEN);
|
||||
|
||||
return bcmerrorstrtable[-bcmerror];
|
||||
}
|
||||
|
||||
/* iovar table lookup */
|
||||
const bcm_iovar_t *bcm_iovar_lookup(const bcm_iovar_t *table, const char *name)
|
||||
{
|
||||
const bcm_iovar_t *vi;
|
||||
const char *lookup_name;
|
||||
|
||||
/* skip any ':' delimited option prefixes */
|
||||
lookup_name = strrchr(name, ':');
|
||||
if (lookup_name != NULL)
|
||||
lookup_name++;
|
||||
else
|
||||
lookup_name = name;
|
||||
|
||||
ASSERT(table != NULL);
|
||||
|
||||
for (vi = table; vi->name; vi++) {
|
||||
if (!strcmp(vi->name, lookup_name))
|
||||
return vi;
|
||||
}
|
||||
/* ran to end of table */
|
||||
|
||||
return NULL; /* var name not found */
|
||||
}
|
||||
|
||||
int bcm_iovar_lencheck(const bcm_iovar_t *vi, void *arg, int len, bool set)
|
||||
{
|
||||
int bcmerror = 0;
|
||||
@ -456,7 +642,7 @@ static const u8 crc8_table[256] = {
|
||||
#define CRC_INNER_LOOP(n, c, x) \
|
||||
((c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff])
|
||||
|
||||
u8 BCMROMFN(hndcrc8) (u8 *pdata, /* pointer to array of data to process */
|
||||
u8 hndcrc8(u8 *pdata, /* pointer to array of data to process */
|
||||
uint nbytes, /* number of input data bytes to process */
|
||||
u8 crc /* either CRC8_INIT_VALUE or previous return value */
|
||||
) {
|
||||
@ -526,21 +712,128 @@ static const u16 crc16_table[256] = {
|
||||
0x7BC7, 0x6A4E, 0x58D5, 0x495C, 0x3DE3, 0x2C6A, 0x1EF1, 0x0F78
|
||||
};
|
||||
|
||||
u16 BCMROMFN(hndcrc16) (u8 *pdata, /* pointer to array of data to process */
|
||||
uint nbytes, /* number of input data bytes to process */
|
||||
u16 crc /* either CRC16_INIT_VALUE or previous return value */
|
||||
u16 hndcrc16(u8 *pdata, /* pointer to array of data to process */
|
||||
uint nbytes, /* number of input data bytes to process */
|
||||
u16 crc /* either CRC16_INIT_VALUE or previous return value */
|
||||
) {
|
||||
while (nbytes-- > 0)
|
||||
CRC_INNER_LOOP(16, crc, *pdata++);
|
||||
return crc;
|
||||
}
|
||||
|
||||
static const u32 crc32_table[256] = {
|
||||
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
|
||||
0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
|
||||
0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
|
||||
0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
|
||||
0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
|
||||
0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
|
||||
0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
|
||||
0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
|
||||
0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
|
||||
0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
|
||||
0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
|
||||
0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
|
||||
0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
|
||||
0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
|
||||
0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
|
||||
0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
|
||||
0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
|
||||
0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
|
||||
0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
|
||||
0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
|
||||
0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
|
||||
0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
|
||||
0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
|
||||
0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
|
||||
0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
|
||||
0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
|
||||
0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
|
||||
0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
|
||||
0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
|
||||
0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
|
||||
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
|
||||
0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
|
||||
0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
|
||||
0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
|
||||
0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
|
||||
0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
|
||||
0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
|
||||
0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
|
||||
0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
|
||||
0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
|
||||
0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
|
||||
0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
|
||||
0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
|
||||
0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
|
||||
0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
|
||||
0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
|
||||
0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
|
||||
0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
|
||||
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
|
||||
0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
|
||||
0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
|
||||
0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
|
||||
0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
|
||||
0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
|
||||
0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
|
||||
0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
|
||||
0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
|
||||
0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
|
||||
0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
|
||||
0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
|
||||
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
|
||||
0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
|
||||
0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
|
||||
0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
|
||||
};
|
||||
|
||||
u32 hndcrc32(u8 *pdata, /* pointer to array of data to process */
|
||||
uint nbytes, /* number of input data bytes to process */
|
||||
u32 crc /* either CRC32_INIT_VALUE or previous
|
||||
return value */
|
||||
)
|
||||
{
|
||||
u8 *pend;
|
||||
#ifdef __mips__
|
||||
u8 tmp[4];
|
||||
unsigned long *tptr = (unsigned long *) tmp;
|
||||
|
||||
/* in case the beginning of the buffer isn't aligned */
|
||||
pend = (u8 *) ((uint) (pdata + 3) & 0xfffffffc);
|
||||
nbytes -= (pend - pdata);
|
||||
while (pdata < pend)
|
||||
CRC_INNER_LOOP(32, crc, *pdata++);
|
||||
|
||||
/* handle bulk of data as 32-bit words */
|
||||
pend = pdata + (nbytes & 0xfffffffc);
|
||||
while (pdata < pend) {
|
||||
*tptr = *(unsigned long *) pdata;
|
||||
pdata += sizeof(unsigned long *);
|
||||
CRC_INNER_LOOP(32, crc, tmp[0]);
|
||||
CRC_INNER_LOOP(32, crc, tmp[1]);
|
||||
CRC_INNER_LOOP(32, crc, tmp[2]);
|
||||
CRC_INNER_LOOP(32, crc, tmp[3]);
|
||||
}
|
||||
|
||||
/* 1-3 bytes at end of buffer */
|
||||
pend = pdata + (nbytes & 0x03);
|
||||
while (pdata < pend)
|
||||
CRC_INNER_LOOP(32, crc, *pdata++);
|
||||
#else
|
||||
pend = pdata + nbytes;
|
||||
while (pdata < pend)
|
||||
CRC_INNER_LOOP(32, crc, *pdata++);
|
||||
#endif /* __mips__ */
|
||||
|
||||
return crc;
|
||||
}
|
||||
/*
|
||||
* Traverse a string of 1-byte tag/1-byte length/variable-length value
|
||||
* triples, returning a pointer to the substring whose first element
|
||||
* matches tag
|
||||
*/
|
||||
bcm_tlv_t *BCMROMFN(bcm_parse_tlvs) (void *buf, int buflen, uint key)
|
||||
bcm_tlv_t *bcm_parse_tlvs(void *buf, int buflen, uint key)
|
||||
{
|
||||
bcm_tlv_t *elt;
|
||||
int totlen;
|
||||
@ -678,7 +971,108 @@ char *bcm_chipname(uint chipid, char *buf, uint len)
|
||||
return buf;
|
||||
}
|
||||
|
||||
uint BCMROMFN(bcm_bitcount) (u8 *bitmap, uint length)
|
||||
uint bcm_mkiovar(char *name, char *data, uint datalen, char *buf, uint buflen)
|
||||
{
|
||||
uint len;
|
||||
|
||||
len = strlen(name) + 1;
|
||||
|
||||
if ((len + datalen) > buflen)
|
||||
return 0;
|
||||
|
||||
strncpy(buf, name, buflen);
|
||||
|
||||
/* append data onto the end of the name string */
|
||||
memcpy(&buf[len], data, datalen);
|
||||
len += datalen;
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
/* Quarter dBm units to mW
|
||||
* Table starts at QDBM_OFFSET, so the first entry is mW for qdBm=153
|
||||
* Table is offset so the last entry is largest mW value that fits in
|
||||
* a u16.
|
||||
*/
|
||||
|
||||
#define QDBM_OFFSET 153 /* Offset for first entry */
|
||||
#define QDBM_TABLE_LEN 40 /* Table size */
|
||||
|
||||
/* Smallest mW value that will round up to the first table entry, QDBM_OFFSET.
|
||||
* Value is ( mW(QDBM_OFFSET - 1) + mW(QDBM_OFFSET) ) / 2
|
||||
*/
|
||||
#define QDBM_TABLE_LOW_BOUND 6493 /* Low bound */
|
||||
|
||||
/* Largest mW value that will round down to the last table entry,
|
||||
* QDBM_OFFSET + QDBM_TABLE_LEN-1.
|
||||
* Value is ( mW(QDBM_OFFSET + QDBM_TABLE_LEN - 1) +
|
||||
* mW(QDBM_OFFSET + QDBM_TABLE_LEN) ) / 2.
|
||||
*/
|
||||
#define QDBM_TABLE_HIGH_BOUND 64938 /* High bound */
|
||||
|
||||
static const u16 nqdBm_to_mW_map[QDBM_TABLE_LEN] = {
|
||||
/* qdBm: +0 +1 +2 +3 +4 +5 +6 +7 */
|
||||
/* 153: */ 6683, 7079, 7499, 7943, 8414, 8913, 9441, 10000,
|
||||
/* 161: */ 10593, 11220, 11885, 12589, 13335, 14125, 14962, 15849,
|
||||
/* 169: */ 16788, 17783, 18836, 19953, 21135, 22387, 23714, 25119,
|
||||
/* 177: */ 26607, 28184, 29854, 31623, 33497, 35481, 37584, 39811,
|
||||
/* 185: */ 42170, 44668, 47315, 50119, 53088, 56234, 59566, 63096
|
||||
};
|
||||
|
||||
u16 bcm_qdbm_to_mw(u8 qdbm)
|
||||
{
|
||||
uint factor = 1;
|
||||
int idx = qdbm - QDBM_OFFSET;
|
||||
|
||||
if (idx >= QDBM_TABLE_LEN) {
|
||||
/* clamp to max u16 mW value */
|
||||
return 0xFFFF;
|
||||
}
|
||||
|
||||
/* scale the qdBm index up to the range of the table 0-40
|
||||
* where an offset of 40 qdBm equals a factor of 10 mW.
|
||||
*/
|
||||
while (idx < 0) {
|
||||
idx += 40;
|
||||
factor *= 10;
|
||||
}
|
||||
|
||||
/* return the mW value scaled down to the correct factor of 10,
|
||||
* adding in factor/2 to get proper rounding.
|
||||
*/
|
||||
return (nqdBm_to_mW_map[idx] + factor / 2) / factor;
|
||||
}
|
||||
u8 bcm_mw_to_qdbm(u16 mw)
|
||||
{
|
||||
u8 qdbm;
|
||||
int offset;
|
||||
uint mw_uint = mw;
|
||||
uint boundary;
|
||||
|
||||
/* handle boundary case */
|
||||
if (mw_uint <= 1)
|
||||
return 0;
|
||||
|
||||
offset = QDBM_OFFSET;
|
||||
|
||||
/* move mw into the range of the table */
|
||||
while (mw_uint < QDBM_TABLE_LOW_BOUND) {
|
||||
mw_uint *= 10;
|
||||
offset -= 40;
|
||||
}
|
||||
|
||||
for (qdbm = 0; qdbm < QDBM_TABLE_LEN - 1; qdbm++) {
|
||||
boundary = nqdBm_to_mW_map[qdbm] + (nqdBm_to_mW_map[qdbm + 1] -
|
||||
nqdBm_to_mW_map[qdbm]) / 2;
|
||||
if (mw_uint < boundary)
|
||||
break;
|
||||
}
|
||||
|
||||
qdbm += (u8) offset;
|
||||
|
||||
return qdbm;
|
||||
}
|
||||
uint bcm_bitcount(u8 *bitmap, uint length)
|
||||
{
|
||||
uint bitcount = 0, i;
|
||||
u8 tmp;
|
||||
@ -691,3 +1085,111 @@ uint BCMROMFN(bcm_bitcount) (u8 *bitmap, uint length)
|
||||
}
|
||||
return bitcount;
|
||||
}
|
||||
/* Initialization of bcmstrbuf structure */
|
||||
void bcm_binit(struct bcmstrbuf *b, char *buf, uint size)
|
||||
{
|
||||
b->origsize = b->size = size;
|
||||
b->origbuf = b->buf = buf;
|
||||
}
|
||||
|
||||
/* Buffer sprintf wrapper to guard against buffer overflow */
|
||||
int bcm_bprintf(struct bcmstrbuf *b, const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
int r;
|
||||
|
||||
va_start(ap, fmt);
|
||||
r = vsnprintf(b->buf, b->size, fmt, ap);
|
||||
|
||||
/* Non Ansi C99 compliant returns -1,
|
||||
* Ansi compliant return r >= b->size,
|
||||
* bcmstdlib returns 0, handle all
|
||||
*/
|
||||
if ((r == -1) || (r >= (int)b->size) || (r == 0)) {
|
||||
b->size = 0;
|
||||
} else {
|
||||
b->size -= r;
|
||||
b->buf += r;
|
||||
}
|
||||
|
||||
va_end(ap);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Function: bcmstrtok
|
||||
*
|
||||
* Purpose:
|
||||
* Tokenizes a string. This function is conceptually similiar to ANSI C strtok(),
|
||||
* but allows strToken() to be used by different strings or callers at the same
|
||||
* time. Each call modifies '*string' by substituting a NULL character for the
|
||||
* first delimiter that is encountered, and updates 'string' to point to the char
|
||||
* after the delimiter. Leading delimiters are skipped.
|
||||
*
|
||||
* Parameters:
|
||||
* string (mod) Ptr to string ptr, updated by token.
|
||||
* delimiters (in) Set of delimiter characters.
|
||||
* tokdelim (out) Character that delimits the returned token. (May
|
||||
* be set to NULL if token delimiter is not required).
|
||||
*
|
||||
* Returns: Pointer to the next token found. NULL when no more tokens are found.
|
||||
*****************************************************************************
|
||||
*/
|
||||
char *bcmstrtok(char **string, const char *delimiters, char *tokdelim)
|
||||
{
|
||||
unsigned char *str;
|
||||
unsigned long map[8];
|
||||
int count;
|
||||
char *nextoken;
|
||||
|
||||
if (tokdelim != NULL) {
|
||||
/* Prime the token delimiter */
|
||||
*tokdelim = '\0';
|
||||
}
|
||||
|
||||
/* Clear control map */
|
||||
for (count = 0; count < 8; count++) {
|
||||
map[count] = 0;
|
||||
}
|
||||
|
||||
/* Set bits in delimiter table */
|
||||
do {
|
||||
map[*delimiters >> 5] |= (1 << (*delimiters & 31));
|
||||
} while (*delimiters++);
|
||||
|
||||
str = (unsigned char *)*string;
|
||||
|
||||
/* Find beginning of token (skip over leading delimiters). Note that
|
||||
* there is no token iff this loop sets str to point to the terminal
|
||||
* null (*str == '\0')
|
||||
*/
|
||||
while (((map[*str >> 5] & (1 << (*str & 31))) && *str) || (*str == ' ')) {
|
||||
str++;
|
||||
}
|
||||
|
||||
nextoken = (char *)str;
|
||||
|
||||
/* Find the end of the token. If it is not the end of the string,
|
||||
* put a null there.
|
||||
*/
|
||||
for (; *str; str++) {
|
||||
if (map[*str >> 5] & (1 << (*str & 31))) {
|
||||
if (tokdelim != NULL) {
|
||||
*tokdelim = *str;
|
||||
}
|
||||
|
||||
*str++ = '\0';
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
*string = (char *)str;
|
||||
|
||||
/* Determine if a token has been found. */
|
||||
if (nextoken == (char *)str) {
|
||||
return NULL;
|
||||
} else {
|
||||
return nextoken;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user