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

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

Merge tag 'mac80211-next-for-davem-2015-10-05' of... 

Merge tag 'mac80211-next-for-davem-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
For the current cycle, we have the following right now:
 * many internal fixes, API improvements, cleanups, etc.
 * full AP client state tracking in cfg80211/mac80211 from Ayala
 * VHT support (in mac80211) for mesh
 * some A-MSDU in A-MPDU support from Emmanuel
 * show current TX power to userspace (from Rafał)
 * support for netlink dump in vendor commands (myself)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 390a4bee 5edfcee5

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

+1 −1
Original line number Diff line number Diff line
@@ -6144,7 +6144,7 @@ static int ath10k_ampdu_action(struct ieee80211_hw *hw, 
			       struct ieee80211_vif *vif,

			       enum ieee80211_ampdu_mlme_action action,

			       struct ieee80211_sta *sta, u16 tid, u16 *ssn,

			       u8 buf_size)

			       u8 buf_size, bool amsdu)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

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

+1 −1
Original line number Diff line number Diff line
@@ -1659,7 +1659,7 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw, 
				  struct ieee80211_vif *vif,

				  enum ieee80211_ampdu_mlme_action action,

				  struct ieee80211_sta *sta,

				  u16 tid, u16 *ssn, u8 buf_size)

				  u16 tid, u16 *ssn, u8 buf_size, bool amsdu)

{

	struct ath9k_htc_priv *priv = hw->priv;

	struct ath9k_htc_sta *ista;

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

+1 −1
Original line number Diff line number Diff line
@@ -1856,7 +1856,7 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw, 
			      struct ieee80211_vif *vif,

			      enum ieee80211_ampdu_mlme_action action,

			      struct ieee80211_sta *sta,

			      u16 tid, u16 *ssn, u8 buf_size)

			      u16 tid, u16 *ssn, u8 buf_size, bool amsdu)

{

	struct ath_softc *sc = hw->priv;

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

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

+1 −1
Original line number Diff line number Diff line
@@ -1415,7 +1415,7 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw, 
				    struct ieee80211_vif *vif,

				    enum ieee80211_ampdu_mlme_action action,

				    struct ieee80211_sta *sta,

				    u16 tid, u16 *ssn, u8 buf_size)

				    u16 tid, u16 *ssn, u8 buf_size, bool amsdu)

{

	struct ar9170 *ar = hw->priv;

	struct carl9170_sta_info *sta_info = (void *) sta->drv_priv;

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

+1 −1
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ static int wcn36xx_ampdu_action(struct ieee80211_hw *hw, 
		    struct ieee80211_vif *vif,

		    enum ieee80211_ampdu_mlme_action action,

		    struct ieee80211_sta *sta, u16 tid, u16 *ssn,

		    u8 buf_size)

		    u8 buf_size, bool amsdu)

{

	struct wcn36xx *wcn = hw->priv;

	struct wcn36xx_sta *sta_priv = NULL;