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>

diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index f5f914f..2a139aa 100644 (file)
--- 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);