summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-08-08 15:58:57 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-23 13:00:09 -0700
commit09f882b0713fc1a2f1b48342179f70131f5e4d0a (patch)
treef68ecb120499f015623e6e708def1150b44dee72
parentcc1e1a1bc65bfc06875cf91af3ce68204430eae3 (diff)
downloadop-kernel-dev-09f882b0713fc1a2f1b48342179f70131f5e4d0a.zip
op-kernel-dev-09f882b0713fc1a2f1b48342179f70131f5e4d0a.tar.gz
staging: brcm80211: cleanup to get rid of 'over 80 character' line
One checkpatch warning was remaining in the brcmsmac driver. The code has been restructured to get rid of this last checkpatch warning. Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/brcmsmac/main.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index f5f914f..2a139aa 100644
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/drivers/staging/brcm80211/brcmsmac/main.c
@@ -6253,14 +6253,13 @@ _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
/* merge rateset coming in with the current mcsset */
if (N_ENAB(wlc->pub)) {
+ struct brcms_bss_info *mcsset_bss;
if (bsscfg->associated)
- memcpy(rs.mcs,
- &current_bss->rateset.mcs[0],
- MCSSET_LEN);
+ mcsset_bss = current_bss;
else
- memcpy(rs.mcs,
- &wlc->default_bss->rateset.mcs[0],
- MCSSET_LEN);
+ mcsset_bss = wlc->default_bss;
+ memcpy(rs.mcs, &mcsset_bss->rateset.mcs[0],
+ MCSSET_LEN);
}
bcmerror = brcms_c_set_rateset(wlc, &rs);
OpenPOWER on IntegriCloud