lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 158/241] mac80211_hwsim: use per-interface power level
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johannes Berg <johannes.berg@intel.com>


    [ Upstream commit 1d5e9f80ab021e3e1f9436627a4ad07a143ccb2c ]

    When channel contexts are used, there's no global power level
    (the power_level is always 0). Use the per-interface TX power
    in mac80211_hwsim to have a proper setting for both cases.

    This fixes the bgscan_simple and bgscan_learn test cases when
    the number of channels advertised by hwsim is >1 by default.

    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wireless/mac80211_hwsim.c | 9 +++------
    1 file changed, 3 insertions(+), 6 deletions(-)

    --- a/drivers/net/wireless/mac80211_hwsim.c
    +++ b/drivers/net/wireless/mac80211_hwsim.c
    @@ -552,8 +552,6 @@ struct mac80211_hwsim_data {
    /* wmediumd portid responsible for netgroup of this radio */
    u32 wmediumd;

    - int power_level;
    -
    /* difference between this hw's clock and the real clock, in usecs */
    s64 tsf_offset;
    s64 bcn_delta;
    @@ -1208,7 +1206,9 @@ static bool mac80211_hwsim_tx_frame_no_n
    if (info->control.rates[0].flags & IEEE80211_TX_RC_SHORT_GI)
    rx_status.flag |= RX_FLAG_SHORT_GI;
    /* TODO: simulate real signal strength (and optional packet loss) */
    - rx_status.signal = data->power_level - 50;
    + rx_status.signal = -50;
    + if (info->control.vif)
    + rx_status.signal += info->control.vif->bss_conf.txpower;

    if (data->ps != PS_DISABLED)
    hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);
    @@ -1607,7 +1607,6 @@ static int mac80211_hwsim_config(struct

    WARN_ON(data->channel && data->use_chanctx);

    - data->power_level = conf->power_level;
    if (!data->started || !data->beacon_int)
    tasklet_hrtimer_cancel(&data->beacon_timer);
    else if (!hrtimer_is_queued(&data->beacon_timer.timer)) {
    @@ -2212,7 +2211,6 @@ static const char mac80211_hwsim_gstring
    "d_tx_failed",
    "d_ps_mode",
    "d_group",
    - "d_tx_power",
    };

    #define MAC80211_HWSIM_SSTATS_LEN ARRAY_SIZE(mac80211_hwsim_gstrings_stats)
    @@ -2249,7 +2247,6 @@ static void mac80211_hwsim_get_et_stats(
    data[i++] = ar->tx_failed;
    data[i++] = ar->ps;
    data[i++] = ar->group;
    - data[i++] = ar->power_level;

    WARN_ON(i != MAC80211_HWSIM_SSTATS_LEN);
    }

    \
     
     \ /
      Last update: 2018-03-19 20:22    [W:4.069 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site