greearb@xxxxxxxxxxxxxxx writes:
> From: Ben Greear <greearb@xxxxxxxxxxxxxxx>
>
> Check vdev map has space before calling ffs,
> fix invalid cleanup in failure to create vdev
> case.
>
> Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
[...]
> @@ -594,14 +594,14 @@ static int ath10k_monitor_vdev_create(struct ath10k *ar)
>
> lockdep_assert_held(&ar->conf_mutex);
>
> - bit = ffs(ar->free_vdev_map);
> - if (bit == 0) {
> + if (!ar->free_vdev_map) {
As we are using ar->free_vdev_map as a bitmap, I think !foo is just
confusing. Wouldn't '== 0' make more sense here?
> @@ -638,7 +632,7 @@ static int ath10k_monitor_vdev_delete(struct ath10k *ar)
> return ret;
> }
>
> - ar->free_vdev_map |= 1 << (ar->monitor_vdev_id);
> + ar->free_vdev_map |= (1 << ar->monitor_vdev_id);
Aren't the parentheses useless here?
> @@ -2622,11 +2616,12 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
> INIT_WORK(&arvif->wep_key_work, ath10k_tx_wep_key_work);
> INIT_LIST_HEAD(&arvif->list);
>
> - bit = ffs(ar->free_vdev_map);
> - if (bit == 0) {
> + if (!ar->free_vdev_map) {
Ditto about '==0'.
> + ath10k_warn("Free vdev map is empty, no more interfaces allowed.\n");
> ret = -EBUSY;
> goto err;
> }
> + bit = ffs(ar->free_vdev_map);
Empty line after '}', please.
> @@ -2669,7 +2664,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
> goto err;
> }
>
> - ar->free_vdev_map &= ~BIT(arvif->vdev_id);
> + ar->free_vdev_map &= ~(1 << arvif->vdev_id);
Why remove the BIT()? Not that it matters much, I just think it's easier
to read when BIT() macro is used. Would be good to convert all cases to
use BIT anyway, but that's for a separate patch.
> err_vdev_delete:
> ath10k_wmi_vdev_delete(ar, arvif->vdev_id);
> - ar->free_vdev_map &= ~BIT(arvif->vdev_id);
> + ar->free_vdev_map |= (1 << arvif->vdev_id);
Again why remove BIT()?
> @@ -2792,7 +2787,7 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw,
> }
> spin_unlock_bh(&ar->data_lock);
>
> - ar->free_vdev_map |= 1 << (arvif->vdev_id);
> + ar->free_vdev_map |= (1 << arvif->vdev_id);
Do we need the parenthesis?
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
