iwlwifi: mvm: remove dead code
authorSara Sharon <sara.sharon@intel.com>
Thu, 23 Aug 2018 09:10:01 +0000 (12:10 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 20 Dec 2018 07:05:41 +0000 (09:05 +0200)
In iwl_mvm_tx_skb_non_sta(), in case of managed interface,
the AP station was supposed to be used for multicast frames
instead of the auxiliary station to avoid frames possibly
sent to an absent P2P GO. However, when moving to DQA mode,
this was broken as no valid queue was assigned. This is fixed
by a recent patch that directs all non-offchannel traffic to
ap station earlier in the TX path. However, the broken, and
now dead code, remained. Remove it.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/intel/iwlwifi/mvm/tx.c

index 09cabf3..7a9ec68 100644 (file)
@@ -763,12 +763,6 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)
                                                           hdr->frame_control);
                        if (queue < 0)
                                return -1;
-               } else if (info.control.vif->type == NL80211_IFTYPE_STATION &&
-                          is_multicast_ether_addr(hdr->addr1)) {
-                       u8 ap_sta_id = READ_ONCE(mvmvif->ap_sta_id);
-
-                       if (ap_sta_id != IWL_MVM_INVALID_STA)
-                               sta_id = ap_sta_id;
                } else if (info.control.vif->type == NL80211_IFTYPE_MONITOR) {
                        queue = mvm->snif_queue;
                        sta_id = mvm->snif_sta.sta_id;