lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 073/176] cfg80211: pass the reg hint initiator to helpers
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

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

    From: Luis R. Rodriguez <lrodriguez@atheros.com>

    commit 7ca43d03b1291481bdf894bbaec5d580e7684e7d upstream.

    This is required later.

    Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
    Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    net/wireless/reg.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    --- a/net/wireless/reg.c
    +++ b/net/wireless/reg.c
    @@ -723,7 +723,9 @@ EXPORT_SYMBOL(freq_reg_info);
    * on the wiphy with the target_bw specified. Then we can simply use
    * that below for the desired_bw_khz below.
    */
    -static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band,
    +static void handle_channel(struct wiphy *wiphy,
    + enum nl80211_reg_initiator initiator,
    + enum ieee80211_band band,
    unsigned int chan_idx)
    {
    int r;
    @@ -787,7 +789,9 @@ static void handle_channel(struct wiphy
    chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp);
    }

    -static void handle_band(struct wiphy *wiphy, enum ieee80211_band band)
    +static void handle_band(struct wiphy *wiphy,
    + enum ieee80211_band band,
    + enum nl80211_reg_initiator initiator)
    {
    unsigned int i;
    struct ieee80211_supported_band *sband;
    @@ -796,7 +800,7 @@ static void handle_band(struct wiphy *wi
    sband = wiphy->bands[band];

    for (i = 0; i < sband->n_channels; i++)
    - handle_channel(wiphy, band, i);
    + handle_channel(wiphy, initiator, band, i);
    }

    static bool ignore_reg_update(struct wiphy *wiphy,
    @@ -1033,7 +1037,7 @@ void wiphy_update_regulatory(struct wiph
    goto out;
    for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
    if (wiphy->bands[band])
    - handle_band(wiphy, band);
    + handle_band(wiphy, band, initiator);
    }
    out:
    reg_process_beacons(wiphy);



    \
     
     \ /
      Last update: 2011-02-16 01:55    [W:2.964 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site