Commit ac5fe226 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2019-07-31' of... 

Merge tag 'mac80211-next-for-davem-2019-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
We have a reasonably large number of changes:
 * lots more HE (802.11ax) support, particularly things
   relevant for the the AP side, but also mesh support
 * debugfs cleanups from Greg
 * some more work on extended key ID
 * start using genl parallel_ops, as preparation for
   weaning ourselves off RTNL and getting parallelism
 * various other changes all over
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 164f0de3 f39b07fd

drivers/net/wireless/ath/ath10k/mac.c

+2 −1
Original line number Diff line number Diff line
@@ -6970,7 +6970,8 @@ exit: 
	return ret;

}



static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw)

static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw,

					   struct ieee80211_vif *vif)

{

	struct ath10k *ar = hw->priv;

drivers/net/wireless/ath/ath9k/main.c

+2 −1
Original line number Diff line number Diff line
@@ -2392,7 +2392,8 @@ out: 
	return ret;

}



static int ath9k_cancel_remain_on_channel(struct ieee80211_hw *hw)

static int ath9k_cancel_remain_on_channel(struct ieee80211_hw *hw,

					  struct ieee80211_vif *vif)

{

	struct ath_softc *sc = hw->priv;

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

drivers/net/wireless/intel/iwlwifi/dvm/rs.c

+8 −21
Original line number Diff line number Diff line
@@ -3256,29 +3256,17 @@ static void rs_add_debugfs(void *priv, void *priv_sta, 
					struct dentry *dir)

{

	struct iwl_lq_sta *lq_sta = priv_sta;

	lq_sta->rs_sta_dbgfs_scale_table_file =

		debugfs_create_file("rate_scale_table", 0600, dir,

				    lq_sta, &rs_sta_dbgfs_scale_table_ops);

	lq_sta->rs_sta_dbgfs_stats_table_file =

		debugfs_create_file("rate_stats_table", 0400, dir,

				    lq_sta, &rs_sta_dbgfs_stats_table_ops);

	lq_sta->rs_sta_dbgfs_rate_scale_data_file =

		debugfs_create_file("rate_scale_data", 0400, dir,

				    lq_sta, &rs_sta_dbgfs_rate_scale_data_ops);

	lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file =



	debugfs_create_file("rate_scale_table", 0600, dir, lq_sta,

			    &rs_sta_dbgfs_scale_table_ops);

	debugfs_create_file("rate_stats_table", 0400, dir, lq_sta,

			    &rs_sta_dbgfs_stats_table_ops);

	debugfs_create_file("rate_scale_data", 0400, dir, lq_sta,

			    &rs_sta_dbgfs_rate_scale_data_ops);

	debugfs_create_u8("tx_agg_tid_enable", 0600, dir,

			  &lq_sta->tx_agg_tid_en);



}



static void rs_remove_debugfs(void *priv, void *priv_sta)

{

	struct iwl_lq_sta *lq_sta = priv_sta;

	debugfs_remove(lq_sta->rs_sta_dbgfs_scale_table_file);

	debugfs_remove(lq_sta->rs_sta_dbgfs_stats_table_file);

	debugfs_remove(lq_sta->rs_sta_dbgfs_rate_scale_data_file);

	debugfs_remove(lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file);

}

#endif



/*
@@ -3303,7 +3291,6 @@ static const struct rate_control_ops rs_ops = { 
	.free_sta = rs_free_sta,

#ifdef CONFIG_MAC80211_DEBUGFS

	.add_sta_debugfs = rs_add_debugfs,

	.remove_sta_debugfs = rs_remove_debugfs,

#endif

};

drivers/net/wireless/intel/iwlwifi/dvm/rs.h

+0 −4
Original line number Diff line number Diff line
@@ -356,10 +356,6 @@ struct iwl_lq_sta { 
	struct iwl_traffic_load load[IWL_MAX_TID_COUNT];

	u8 tx_agg_tid_en;

#ifdef CONFIG_MAC80211_DEBUGFS

	struct dentry *rs_sta_dbgfs_scale_table_file;

	struct dentry *rs_sta_dbgfs_stats_table_file;

	struct dentry *rs_sta_dbgfs_rate_scale_data_file;

	struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;

	u32 dbg_fixed_rate;

#endif

	struct iwl_priv *drv;

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

+2 −1
Original line number Diff line number Diff line
@@ -4010,7 +4010,8 @@ out_unlock: 
	return ret;

}



static int iwl_mvm_cancel_roc(struct ieee80211_hw *hw)

static int iwl_mvm_cancel_roc(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

CRA Git | Maintained and supported by SUSTech CRA and CCSE