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

Commit c78b3841 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

parents 0d4e6717 f00f188f

Documentation/DocBook/80211.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ 
      </section>

!Finclude/net/mac80211.h ieee80211_get_buffered_bc

!Finclude/net/mac80211.h ieee80211_beacon_get

!Finclude/net/mac80211.h ieee80211_sta_eosp_irqsafe

!Finclude/net/mac80211.h ieee80211_sta_eosp

!Finclude/net/mac80211.h ieee80211_frame_release_type

!Finclude/net/mac80211.h ieee80211_sta_ps_transition

!Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni

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

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

}



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

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

{

	struct ar5523 *ar = hw->priv;

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

+1 −1
Original line number Diff line number Diff line
@@ -1745,7 +1745,7 @@ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class) 
	mutex_unlock(&sc->mutex);

}



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

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

{

	struct ath_softc *sc = hw->priv;

	struct ath_hw *ah = sc->sc_ah;

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

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

}



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

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

{

	struct ar9170 *ar = hw->priv;

	unsigned int vid;

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

+1 −1
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ static bool brcms_tx_flush_completed(struct brcms_info *wl) 
	return result;

}



static void brcms_ops_flush(struct ieee80211_hw *hw, bool drop)

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

{

	struct brcms_info *wl = hw->priv;

	int ret;