mac80211: use bitfield helpers for BA session action frames

Use the appropriate bitfield helpers for encoding and decoding
the capability field in the BA session action frames instead of
open-coding the shifts/masks.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201206145305.0c46e5097cc0.I06e75706770c40b9ba1cabd1f8a78ab7a05c5b73@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index cd4cf84..cce28e3 100644 (file)
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -250,10 +250,10 @@ static void ieee80211_send_addba_resp(struct sta_info *sta, u8 *da, u16 tid,
        mgmt->u.action.u.addba_resp.action_code = WLAN_ACTION_ADDBA_RESP;
        mgmt->u.action.u.addba_resp.dialog_token = dialog_token;
 
-       capab = (u16)(amsdu << 0);      /* bit 0 A-MSDU support */
-       capab |= (u16)(policy << 1);    /* bit 1 aggregation policy */
-       capab |= (u16)(tid << 2);       /* bit 5:2 TID number */
-       capab |= (u16)(buf_size << 6);  /* bit 15:6 max size of aggregation */
+       capab = u16_encode_bits(amsdu, IEEE80211_ADDBA_PARAM_AMSDU_MASK);
+       capab |= u16_encode_bits(policy, IEEE80211_ADDBA_PARAM_POLICY_MASK);
+       capab |= u16_encode_bits(tid, IEEE80211_ADDBA_PARAM_TID_MASK);
+       capab |= u16_encode_bits(buf_size, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);
 
        mgmt->u.action.u.addba_resp.capab = cpu_to_le16(capab);
        mgmt->u.action.u.addba_resp.timeout = cpu_to_le16(timeout);

diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index b37c8a9..430a585 100644 (file)
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -95,10 +95,10 @@ static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata,
        mgmt->u.action.u.addba_req.action_code = WLAN_ACTION_ADDBA_REQ;
 
        mgmt->u.action.u.addba_req.dialog_token = dialog_token;
-       capab = (u16)(1 << 0);          /* bit 0 A-MSDU support */
-       capab |= (u16)(1 << 1);         /* bit 1 aggregation policy */
-       capab |= (u16)(tid << 2);       /* bit 5:2 TID number */
-       capab |= (u16)(agg_size << 6);  /* bit 15:6 max size of aggergation */
+       capab = IEEE80211_ADDBA_PARAM_AMSDU_MASK;
+       capab |= IEEE80211_ADDBA_PARAM_POLICY_MASK;
+       capab |= u16_encode_bits(tid, IEEE80211_ADDBA_PARAM_TID_MASK);
+       capab |= u16_encode_bits(agg_size, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);
 
        mgmt->u.action.u.addba_req.capab = cpu_to_le16(capab);
 
@@ -950,8 +950,8 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
 
        capab = le16_to_cpu(mgmt->u.action.u.addba_resp.capab);
        amsdu = capab & IEEE80211_ADDBA_PARAM_AMSDU_MASK;
-       tid = (capab & IEEE80211_ADDBA_PARAM_TID_MASK) >> 2;
-       buf_size = (capab & IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK) >> 6;
+       tid = u16_get_bits(capab, IEEE80211_ADDBA_PARAM_TID_MASK);
+       buf_size = u16_get_bits(capab, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);
        buf_size = min(buf_size, local->hw.max_tx_aggregation_subframes);
 
        txq = sta->sta.txq[tid];