Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228317
b: refs/heads/master
c: c41c858
h: refs/heads/master
i:
  228315: b0a2592
v: v3
  • Loading branch information
Roland Vossen authored and Greg Kroah-Hartman committed Dec 8, 2010
1 parent c57a057 commit 5f2abbe
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f077f7185ce19adc234b96c6f9fb815301770c26
refs/heads/master: c41c858f695b6626e2fc0729edc0dd26b091f354
3 changes: 2 additions & 1 deletion trunk/drivers/staging/brcm80211/sys/wlc_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,8 @@ struct wlc_info *wlc_attach_malloc(struct osl_info *osh, uint unit, uint *err,
}
}

wlc->corestate = (wlccore_t *)wlc_calloc(osh, unit, sizeof(wlccore_t));
wlc->corestate = (struct wlccore *)wlc_calloc(osh, unit,
sizeof(struct wlccore));
if (wlc->corestate == NULL) {
*err = 1026;
goto fail;
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -302,15 +302,15 @@ typedef struct wlc_stf {
/*
* core state (mac)
*/
typedef struct wlccore {
struct wlccore {
uint coreidx; /* # sb enumerated core */

/* fifo */
uint *txavail[NFIFO]; /* # tx descriptors available */
s16 txpktpend[NFIFO]; /* tx admission control */

macstat_t *macstat_snapshot; /* mac hw prev read values */
} wlccore_t;
};

/*
* band state (phy+ana+radio)
Expand Down Expand Up @@ -532,9 +532,9 @@ struct wlc_info {
bool clk; /* core is out of reset and has clock */

/* multiband */
wlccore_t *core; /* pointer to active io core */
struct wlccore *core; /* pointer to active io core */
struct wlcband *band; /* pointer to active per-band state */
wlccore_t *corestate; /* per-core state (one per hw core) */
struct wlccore *corestate; /* per-core state (one per hw core) */
/* per-band state (one per phy/radio): */
struct wlcband *bandstate[MAXBANDS];

Expand Down

0 comments on commit 5f2abbe

Please sign in to comment.