lkml.org 
[lkml]   [2013]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 125/127] iwlwifi: mvm: remove P2P_DEVICE support
    Date
    3.9-stable review patch.  If anyone has any objections, please let me know.

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

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

    Unfortunately, advertising P2P_DEVICE support was a little
    premature, a number of issues came up in testing and have
    been fixed for 3.10. Rather than try to backport all the
    different fixes, disable P2P_DEVICE support in the drivers
    using it. For iwlmvm that implies disabling P2P completely
    as it can't support P2P operation w/o P2P Device.

    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wireless/iwlwifi/mvm/mac80211.c | 14 +-------------
    1 file changed, 1 insertion(+), 13 deletions(-)

    --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
    +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
    @@ -82,15 +82,6 @@ static const struct ieee80211_iface_limi
    .types = BIT(NL80211_IFTYPE_STATION) |
    BIT(NL80211_IFTYPE_AP),
    },
    - {
    - .max = 1,
    - .types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
    - BIT(NL80211_IFTYPE_P2P_GO),
    - },
    - {
    - .max = 1,
    - .types = BIT(NL80211_IFTYPE_P2P_DEVICE),
    - },
    };

    static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {
    @@ -136,10 +127,7 @@ int iwl_mvm_mac_setup_register(struct iw
    hw->chanctx_data_size = sizeof(struct iwl_mvm_phy_ctxt);

    hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
    - BIT(NL80211_IFTYPE_P2P_CLIENT) |
    - BIT(NL80211_IFTYPE_AP) |
    - BIT(NL80211_IFTYPE_P2P_GO) |
    - BIT(NL80211_IFTYPE_P2P_DEVICE);
    + BIT(NL80211_IFTYPE_AP);

    hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
    WIPHY_FLAG_DISABLE_BEACON_HINTS |



    \
     
     \ /
      Last update: 2013-06-06 06:22    [W:4.395 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site