lkml.org 
[lkml]   [2013]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 030/104] iwlwifi: dvm: don't send BT_CONFIG on devices w/o Bluetooth
    Date
    3.5.7.22 -stable review patch.  If anyone has any objections, please let me know.

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

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

    commit 707aee401d2467baa785a697f40a6e2d9ee79ad5 upstream.

    The BT_CONFIG command that is sent to the device during
    startup will enable BT coex unless the module parameter
    turns it off, but on devices without Bluetooth this may
    cause problems, as reported in Redhat BZ 885407.

    Fix this by sending the BT_CONFIG command only when the
    device has Bluetooth.

    Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    [ luis: backported to 3.5 (based on bwh's backport to 3.2):
    - file rename: drivers/net/wireless/iwlwifi/dvm/main.c ->
    drivers/net/wireless/iwlwifi/iwl-agn.c
    - use priv->cfg instead of priv->lib ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
    index ec36e2b..8e3629a 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
    @@ -799,7 +799,7 @@ int iwl_alive_start(struct iwl_priv *priv)
    BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);
    if (ret)
    return ret;
    - } else {
    + } else if (priv->cfg->bt_params) {
    /*
    * default is 2-wire BT coexexistence support
    */
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-09-30 13:21    [W:4.077 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site