Commit f6595444 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/jberg/mac80211-next 

Conflicts:
	net/mac80211/chan.c
parents 0006433a f55ee083

Documentation/DocBook/80211.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
!Finclude/net/cfg80211.h wdev_priv

!Finclude/net/cfg80211.h ieee80211_iface_limit

!Finclude/net/cfg80211.h ieee80211_iface_combination

!Finclude/net/cfg80211.h cfg80211_check_combinations

      </chapter>

      <chapter>

      <title>Actions and configuration</title>

drivers/net/wireless/ath/ar5523/ar5523.c

+2 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,8 @@ static int ar5523_set_rts_threshold(struct ieee80211_hw *hw, u32 value) 
	return ret;

}



static void ar5523_flush(struct ieee80211_hw *hw, u32 queues, bool drop)

static void ar5523_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			 u32 queues, bool drop)

{

	struct ar5523 *ar = hw->priv;

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

+2 −1
Original line number Diff line number Diff line
@@ -3635,7 +3635,8 @@ static int ath10k_set_frag_threshold(struct ieee80211_hw *hw, u32 value) 
	return ret;

}



static void ath10k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)

static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			 u32 queues, bool drop)

{

	struct ath10k *ar = hw->priv;

	bool skip;

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

+2 −1
Original line number Diff line number Diff line
@@ -1989,7 +1989,8 @@ static bool ath9k_has_tx_pending(struct ath_softc *sc) 
	return !!npend;

}



static void ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)

static void ath9k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			u32 queues, bool drop)

{

	struct ath_softc *sc = hw->priv;

	struct ath_hw *ah = sc->sc_ah;

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

+3 −1
Original line number Diff line number Diff line
@@ -1707,7 +1707,9 @@ static int carl9170_op_get_survey(struct ieee80211_hw *hw, int idx, 
	return 0;

}



static void carl9170_op_flush(struct ieee80211_hw *hw, u32 queues, bool drop)

static void carl9170_op_flush(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif,

			      u32 queues, bool drop)

{

	struct ar9170 *ar = hw->priv;

	unsigned int vid;