Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259533
b: refs/heads/master
c: 835ef44
h: refs/heads/master
i:
  259531: 596ca14
v: v3
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent c104048 commit abcea1d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: a7c551bc9f8ac1c73536043c19ea8160c8b3549c
refs/heads/master: 835ef44c60bf36411dfaf37b43f5058214bbc016
6 changes: 3 additions & 3 deletions trunk/drivers/staging/brcm80211/brcmsmac/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ const u8 wme_fifo2ac[] = { AC_BK, AC_BE, AC_VI, AC_VO, AC_BE, AC_BE };
/* WME/802.1E Access Category to TX FIFO number */
static const u8 wme_ac2fifo[] = { 1, 0, 2, 3 };

static bool in_send_q = false;
static bool in_send_q;

/* Shared memory location index for various AC params */
#define wme_shmemacindex(ac) wme_ac2fifo[ac]
Expand Down Expand Up @@ -2363,7 +2363,7 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)

/* Set default bss rateset */
wlc->default_bss->rateset.count = rs.count;
memcpy(wlc->default_bss->rateset.rates, rs.rates,
memcpy(wlc->default_bss->rateset.rates, rs.rates,
sizeof(wlc->default_bss->rateset.rates));

return ret;
Expand Down Expand Up @@ -2556,7 +2556,7 @@ _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
}

/* default argument is generic integer */
pval = arg ? (int *)arg:NULL;
pval = arg ? (int *)arg : NULL;

/* This will prevent the misaligned access */
if (pval && (u32) len >= sizeof(val))
Expand Down

0 comments on commit abcea1d

Please sign in to comment.