lkml.org 
[lkml]   [2011]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[093/107] iwlagn: fix change_interface for P2P types
    2.6.39-stable review patch.  If anyone has any objections, please let us know.

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

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

    commit 5306c0807491e891125f4fb08b04340c91530f57 upstream.

    When an interface changes type to a P2P type,
    iwlagn will erroneously set vif->type to the
    P2P type and not the reduced/split type. Fix
    this by keeping "newtype" in another variable
    for the assignment to vif->type.

    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/wireless/iwlwifi/iwl-core.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/net/wireless/iwlwifi/iwl-core.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-core.c
    @@ -1772,6 +1772,7 @@ int iwl_mac_change_interface(struct ieee
    struct iwl_priv *priv = hw->priv;
    struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
    struct iwl_rxon_context *tmp;
    + enum nl80211_iftype newviftype = newtype;
    u32 interface_modes;
    int err;

    @@ -1814,7 +1815,7 @@ int iwl_mac_change_interface(struct ieee

    /* success */
    iwl_teardown_interface(priv, vif, true);
    - vif->type = newtype;
    + vif->type = newviftype;
    vif->p2p = newp2p;
    err = iwl_setup_interface(priv, ctx);
    WARN_ON(err);



    \
     
     \ /
      Last update: 2011-07-08 07:15    [W:0.023 / U:60.952 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site