lkml.org 
[lkml]   [2018]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 010/100] mac80211: fix TX status reporting for ieee80211s
    Date
    From: Yuan-Chi Pang <fu3mo6goo@gmail.com>

    [ Upstream commit c42055105785580563535e6d3143cad95c7ac7ee ]

    TX status reporting to ieee80211s is through ieee80211s_update_metric.
    There are two problems about ieee80211s_update_metric:

    1. The purpose is to estimate the fail probability
    to a specific link. No need to restrict to data frame.

    2. Current implementation does not work if wireless driver does not
    pass tx_status with skb.

    Fix this by removing ieee80211_is_data condition, passing
    ieee80211_tx_status directly to ieee80211s_update_metric, and
    putting it in both __ieee80211_tx_status and ieee80211_tx_status_ext.

    Signed-off-by: Yuan-Chi Pang <fu3mo6goo@gmail.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/mac80211/mesh.h | 3 ++-
    net/mac80211/mesh_hwmp.c | 9 +++------
    net/mac80211/status.c | 4 +++-
    3 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
    index ee56f18cad3f..21526630bf65 100644
    --- a/net/mac80211/mesh.h
    +++ b/net/mac80211/mesh.h
    @@ -217,7 +217,8 @@ void mesh_rmc_free(struct ieee80211_sub_if_data *sdata);
    int mesh_rmc_init(struct ieee80211_sub_if_data *sdata);
    void ieee80211s_init(void);
    void ieee80211s_update_metric(struct ieee80211_local *local,
    - struct sta_info *sta, struct sk_buff *skb);
    + struct sta_info *sta,
    + struct ieee80211_tx_status *st);
    void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata);
    void ieee80211_mesh_teardown_sdata(struct ieee80211_sub_if_data *sdata);
    int ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata);
    diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
    index daf9db3c8f24..6950cd0bf594 100644
    --- a/net/mac80211/mesh_hwmp.c
    +++ b/net/mac80211/mesh_hwmp.c
    @@ -295,15 +295,12 @@ int mesh_path_error_tx(struct ieee80211_sub_if_data *sdata,
    }

    void ieee80211s_update_metric(struct ieee80211_local *local,
    - struct sta_info *sta, struct sk_buff *skb)
    + struct sta_info *sta,
    + struct ieee80211_tx_status *st)
    {
    - struct ieee80211_tx_info *txinfo = IEEE80211_SKB_CB(skb);
    - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
    + struct ieee80211_tx_info *txinfo = st->info;
    int failed;

    - if (!ieee80211_is_data(hdr->frame_control))
    - return;
    -
    failed = !(txinfo->flags & IEEE80211_TX_STAT_ACK);

    /* moving average, scaled to 100.
    diff --git a/net/mac80211/status.c b/net/mac80211/status.c
    index 001a869c059c..91d7c0cd1882 100644
    --- a/net/mac80211/status.c
    +++ b/net/mac80211/status.c
    @@ -808,7 +808,7 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw,

    rate_control_tx_status(local, sband, status);
    if (ieee80211_vif_is_mesh(&sta->sdata->vif))
    - ieee80211s_update_metric(local, sta, skb);
    + ieee80211s_update_metric(local, sta, status);

    if (!(info->flags & IEEE80211_TX_CTL_INJECTED) && acked)
    ieee80211_frame_acked(sta, skb);
    @@ -969,6 +969,8 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,
    }

    rate_control_tx_status(local, sband, status);
    + if (ieee80211_vif_is_mesh(&sta->sdata->vif))
    + ieee80211s_update_metric(local, sta, status);
    }

    if (acked || noack_success) {
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-16 06:37    [W:4.212 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site