[PATCH 2/4] ath10k: split vdev_id calculation from tx function
Kalle Valo
kvalo at qca.qualcomm.com
Mon Sep 30 15:10:30 EDT 2013
Michal Kazior <michal.kazior at tieto.com> writes:
> Signed-off-by: Michal Kazior <michal.kazior at tieto.com>
Empty commit log.
> ---
> drivers/net/wireless/ath/ath10k/mac.c | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
> index 7415a60..4b7c949 100644
> --- a/drivers/net/wireless/ath/ath10k/mac.c
> +++ b/drivers/net/wireless/ath/ath10k/mac.c
> @@ -1421,6 +1421,19 @@ static u8 ath10k_tx_h_get_tid(struct ieee80211_hdr *hdr)
> return ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK;
> }
>
> +static u8 ath10k_tx_h_get_vdev_id(struct ath10k *ar,
> + struct ieee80211_tx_info *info)
> +{
> + if (info->control.vif)
> + return ath10k_vif_to_arvif(info->control.vif)->vdev_id;
> +
> + if (ar->monitor_enabled)
> + return ar->monitor_vdev_id;
> +
> + ath10k_warn("could not resolve vdev id\n");
> + return 0;
> +}
Empty line before return would be nice.
--
Kalle Valo
More information about the ath10k
mailing list