staging: rtl8188eu: issue_action_BA(): extract ADDBA_req pointer
authorLuca Ceresoli <luca@lucaceresoli.net>
Tue, 22 Sep 2015 21:50:38 +0000 (23:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Sep 2015 02:27:22 +0000 (04:27 +0200)
pmlmeinfo->ADDBA_req is accessed three times in this function, but it
contributes to generating lines above 80 characters that are not easy to
split in a nice way.

Extract a pointer to it to make code slightly more concise and fix some
lines over 80 characters.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

index e31eae9b0583aaeec8c8b41e655f7218ac342d8e..0270755ec54600d44c6c02f9a388e9683eb112d9 100644 (file)
@@ -1719,13 +1719,17 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,
                                                  &pattrib->pktlen);
                        break;
                case 1: /* ADDBA rsp */
+               {
+                       struct ADDBA_request *ADDBA_req = &pmlmeinfo->ADDBA_req;
+
                        pframe = rtw_set_fixed_ie(pframe, 1,
-                                                 &pmlmeinfo->ADDBA_req.dialog_token,
+                                                 &ADDBA_req->dialog_token,
                                                  &pattrib->pktlen);
                        pframe = rtw_set_fixed_ie(pframe, 2, &status,
                                                  &pattrib->pktlen);
 
-                       BA_para_set = le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f;
+                       BA_para_set = le16_to_cpu(ADDBA_req->BA_para_set) &
+                                     0x3f;
                        rtw_hal_get_def_var(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor);
                        switch (max_rx_ampdu_factor) {
                        case MAX_AMPDU_FACTOR_64K:
@@ -1754,9 +1758,10 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,
                        pframe = rtw_set_fixed_ie(pframe, 2, &(le_tmp),
                                                  &pattrib->pktlen);
                        pframe = rtw_set_fixed_ie(pframe, 2,
-                                                 &pmlmeinfo->ADDBA_req.BA_timeout_value,
+                                                 &ADDBA_req->BA_timeout_value,
                                                  &pattrib->pktlen);
                        break;
+               }
                case 2:/* DELBA */
                        BA_para_set = (status & 0x1F) << 3;
                        le_tmp = cpu_to_le16(BA_para_set);