Aloka Dixit <quic_alokad@xxxxxxxxxxx> writes:
> On 4/28/2023 10:37 PM, Kalle Valo wrote:
>
>> Aloka Dixit <quic_alokad@xxxxxxxxxxx> writes:
>>
>>> Include MBSSID parameters in WMI vdev up operation.
>>>
>>> Tested-on : IPQ8074 hw2.0 AHB WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
>>> Signed-off-by: Aloka Dixit <quic_alokad@xxxxxxxxxxx>
>>> Co-developed-by: John Crispin <john@xxxxxxxxxxx>
>>> Signed-off-by: John Crispin <john@xxxxxxxxxxx>
>>> ---
>>
>> [...]
>>
>>> @@ -7153,8 +7161,13 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,
>>> ath11k_warn(ab, "failed to update bcn tmpl during csa: %d\n",
>>> ret);
>>> + if (arvif->vif->mbssid_tx_vif)
>>> + tx_arvif = (struct ath11k_vif *)arvif->vif->mbssid_tx_vif->drv_priv;
>>
>> This had a warning:
>>
>> drivers/net/wireless/ath/ath11k/mac.c:7200: line length of 92 exceeds 90 columns
>>
>> In the pending branch I fixed it like this:
>>
>> --- a/drivers/net/wireless/ath/ath11k/mac.c
>> +++ b/drivers/net/wireless/ath/ath11k/mac.c
>> @@ -7143,6 +7143,7 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,
>> {
>> struct ath11k_base *ab = ar->ab;
>> struct ath11k_vif *arvif, *tx_arvif = NULL;
>> + struct ieee80211_vif *mbssid_tx_vif;
>> int ret;
>> int i;
>> bool monitor_vif = false;
>> @@ -7196,8 +7197,10 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,
>> ath11k_warn(ab, "failed to update bcn tmpl during csa: %d\n",
>> ret);
>> - if (arvif->vif->mbssid_tx_vif)
>> - tx_arvif = (struct ath11k_vif *)arvif->vif->mbssid_tx_vif->drv_priv;
>> + mbssid_tx_vif = arvif->vif->mbssid_tx_vif;
>> + if (mbssid_tx_vif)
>> + tx_arvif = (struct ath11k_vif *)mbssid_tx_vif->drv_priv;
>> +
>> ret = ath11k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid,
>> arvif->bssid,
>> tx_arvif ? tx_arvif->bssid : NULL,
>>
>> Link to the commit:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=c884238009e778a0c8202a5eb0a7f68b13200bde
>>
>
> Thank you.
>
> I saw the warning but couldn't decide between adding a new pointer
> variable and letting 2 extra characters for just one assignment.
My scripts will fail loudly if any of the ath*0k-check scripts have
warnings, so just like with compiler warnings I have a zero warnings
policy :) It would become a mess otherwise to know which warnings are
new and which are old.
> What are your thoughts on changing the scripts to allow up to 100?
> Although nl80211 and mac80211 scripts also don't allow that long currently.
Yeah, the checkpatch default is 100 right now and I have understood that
what Linus prefers. I'm just worried that increasing the max to 100
makes our code even more convoluted, it's a challenge as is.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
