Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb180840 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents 5631becb 8eb38710

drivers/net/wireless/iwlwifi/iwl-drv.h

+1 −2
Original line number Diff line number Diff line
@@ -62,8 +62,7 @@ 


#ifndef __iwl_drv_h__

#define __iwl_drv_h__



#include <linux/module.h>

#include <linux/export.h>



/* for all modules */

#define DRV_NAME        "iwlwifi"

drivers/net/wireless/iwlwifi/iwl-phy-db.c

+3 −0
Original line number Diff line number Diff line
@@ -413,6 +413,9 @@ static int iwl_phy_db_send_all_channel_groups( 
		if (!entry)

			return -EINVAL;



		if (WARN_ON_ONCE(!entry->size))

			continue;



		/* Send the requested PHY DB section */

		err = iwl_send_phy_db_cmd(phy_db,

					  type,

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

+1 −4
Original line number Diff line number Diff line
@@ -193,14 +193,11 @@ static void iwl_mvm_mac_iface_iterator(void *_data, u8 *mac, 
u32 iwl_mvm_mac_get_queues_mask(struct iwl_mvm *mvm,

				struct ieee80211_vif *vif)

{

	u32 qmask, ac;

	u32 qmask = 0, ac;



	if (vif->type == NL80211_IFTYPE_P2P_DEVICE)

		return BIT(IWL_MVM_OFFCHANNEL_QUEUE);



	qmask = (vif->cab_queue != IEEE80211_INVAL_HW_QUEUE) ?

		BIT(vif->cab_queue) : 0;



	for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)

		if (vif->hw_queue[ac] != IEEE80211_INVAL_HW_QUEUE)

			qmask |= BIT(vif->hw_queue[ac]);

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+4 −5
Original line number Diff line number Diff line
@@ -81,12 +81,12 @@ 
static const struct ieee80211_iface_limit iwl_mvm_limits[] = {

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_STATION) |

			BIT(NL80211_IFTYPE_AP),

		.types = BIT(NL80211_IFTYPE_STATION),

	},

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_P2P_CLIENT) |

		.types = BIT(NL80211_IFTYPE_AP) |

			BIT(NL80211_IFTYPE_P2P_CLIENT) |

			BIT(NL80211_IFTYPE_P2P_GO),

	},

	{
@@ -651,8 +651,7 @@ static void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm, 
		 * By now, all the AC queues are empty. The AGG queues are

		 * empty too. We already got all the Tx responses for all the

		 * packets in the queues. The drain work can have been

		 * triggered. Flush it. This work item takes the mutex, so kill

		 * it before we take it.

		 * triggered. Flush it.

		 */

		flush_work(&mvm->sta_drained_wk);

	}

drivers/net/wireless/iwlwifi/mvm/mvm.h

+0 −5
Original line number Diff line number Diff line
@@ -689,16 +689,11 @@ void iwl_mvm_bt_coex_vif_assoc(struct iwl_mvm *mvm, struct ieee80211_vif *vif); 
void

iwl_mvm_beacon_filter_debugfs_parameters(struct ieee80211_vif *vif,

					 struct iwl_beacon_filter_cmd *cmd);

int iwl_mvm_dbgfs_set_fw_dbg_log(struct iwl_mvm *mvm);

#else

static inline void

iwl_mvm_beacon_filter_debugfs_parameters(struct ieee80211_vif *vif,

					 struct iwl_beacon_filter_cmd *cmd)

{}

static inline int iwl_mvm_dbgfs_set_fw_dbg_log(struct iwl_mvm *mvm)

{

	return 0;

}

#endif

int iwl_mvm_enable_beacon_filter(struct iwl_mvm *mvm,

				 struct ieee80211_vif *vif);