Message ID | 20200910150708.2179043-2-bryan.odonoghue@linaro.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 59b5c8447c14e7aeda90439f05968bcdbae11af1 |
Delegated to: | Kalle Valo |
Headers | show |
Series | wcn36xx: PHY modifications to support 80MHz operation | expand |
Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote: > Adds HW_VALUE_CHANNEL(hw_value) an access macro that will be used to > extract the channel number from struct ieee80211_channel->hw_value in > preparation for also storing PHY settings for 802.11ac in the upper bits of > hw_value. > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> 5 patches applied to ath-next branch of ath.git, thanks. 59b5c8447c14 wcn36xx: Add accessor macro HW_VALUE_CHANNEL for hardware channels f779a92f7b69 wcn36xx: Use HW_VALUE_CHANNEL macro to get channel number 235b9ae0265b wcn36xx: Add accessor macro HW_VALUE_PHY for PHY settings fc4d4008f810 wcn36xx: Encode PHY mode for 80MHz channel in hw_value e042bc19aace wcn36xx: Set PHY into correct mode for 80MHz channel width
Kalle Valo <kvalo@codeaurora.org> writes: > Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote: > >> Adds HW_VALUE_CHANNEL(hw_value) an access macro that will be used to >> extract the channel number from struct ieee80211_channel->hw_value in >> preparation for also storing PHY settings for 802.11ac in the upper bits of >> hw_value. >> >> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> >> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> > > 5 patches applied to ath-next branch of ath.git, thanks. > > 59b5c8447c14 wcn36xx: Add accessor macro HW_VALUE_CHANNEL for hardware channels > f779a92f7b69 wcn36xx: Use HW_VALUE_CHANNEL macro to get channel number > 235b9ae0265b wcn36xx: Add accessor macro HW_VALUE_PHY for PHY settings > fc4d4008f810 wcn36xx: Encode PHY mode for 80MHz channel in hw_value > e042bc19aace wcn36xx: Set PHY into correct mode for 80MHz channel width Just as a tip for the future, I think this patchset could have been easily just one patch. Also I have noticed the same with other patchsets from you. Splitting the patches to one function per patch is too much, the recommend rule is "one logical change per patch".
diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h index 2da81d9926c4..ebce1ed7adf7 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h @@ -83,7 +83,9 @@ enum wcn36xx_ampdu_state { WCN36XX_AMPDU_OPERATIONAL, }; -#define WCN36XX_HW_CHANNEL(__wcn) (__wcn->hw->conf.chandef.chan->hw_value) +#define HW_VALUE_CHANNEL(hw_value) ((hw_value) & 0xFF) +#define WCN36XX_HW_CHANNEL(__wcn)\ + HW_VALUE_CHANNEL(__wcn->hw->conf.chandef.chan->hw_value) #define WCN36XX_BAND(__wcn) (__wcn->hw->conf.chandef.chan->band) #define WCN36XX_CENTER_FREQ(__wcn) (__wcn->hw->conf.chandef.chan->center_freq) #define WCN36XX_LISTEN_INTERVAL(__wcn) (__wcn->hw->conf.listen_interval)
Adds HW_VALUE_CHANNEL(hw_value) an access macro that will be used to extract the channel number from struct ieee80211_channel->hw_value in preparation for also storing PHY settings for 802.11ac in the upper bits of hw_value. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)