iwlwifi: mvm: rename iwl_mvm_new_bt_coex_notif
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Fri, 29 Mar 2013 11:56:19 +0000 (14:56 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 3 Apr 2013 20:49:55 +0000 (22:49 +0200)
It actually handles a BT coex notification, so rename it
to be more self explained.
Also, this function can always look at mvm->last_bt_notif
provided that the latter is updated on time.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/iwlwifi/mvm/bt-coex.c

index 8f626681b3c8e2db3921d47b9bccdd99074d91b3..810bfa5f6de0a906058422be4a7d26d6329a5698 100644 (file)
@@ -432,18 +432,14 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,
                                      BT_ENABLE_REDUCED_TXPOWER_THRESHOLD);
 }
 
-static void iwl_mvm_new_bt_coex_notif(struct iwl_mvm *mvm,
-                                     struct iwl_bt_coex_profile_notif *notif)
+static void iwl_mvm_bt_coex_notif_handle(struct iwl_mvm *mvm)
 {
        struct iwl_bt_iterator_data data = {
                .mvm = mvm,
-               .notif = notif,
+               .notif = &mvm->last_bt_notif,
                .reduced_tx_power = true,
        };
 
-       /* remember this notification for future use: rssi fluctuations */
-       memcpy(&mvm->last_bt_notif, notif, sizeof(mvm->last_bt_notif));
-
        ieee80211_iterate_active_interfaces_atomic(
                                        mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
                                        iwl_mvm_bt_notif_iterator, &data);
@@ -476,7 +472,10 @@ int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,
                       notif->bt_agg_traffic_load);
        IWL_DEBUG_COEX(mvm, "\tBT ci compliance %d\n", notif->bt_ci_compliance);
 
-       iwl_mvm_new_bt_coex_notif(mvm, notif);
+       /* remember this notification for future use: rssi fluctuations */
+       memcpy(&mvm->last_bt_notif, notif, sizeof(mvm->last_bt_notif));
+
+       iwl_mvm_bt_coex_notif_handle(mvm);
 
        /*
         * This is an async handler for a notification, returning anything other
@@ -586,5 +585,5 @@ void iwl_mvm_bt_coex_vif_assoc(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
        /* else, we can remove all the constraints */
        memset(&mvm->last_bt_notif, 0, sizeof(mvm->last_bt_notif));
 
-       iwl_mvm_new_bt_coex_notif(mvm, &mvm->last_bt_notif);
+       iwl_mvm_bt_coex_notif_handle(mvm);
 }