Commit 01e17dac 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:
	drivers/net/wireless/mac80211_hwsim.c
parents 22c5649e dcf33963

drivers/net/wireless/adm8211.c

+3 −1
Original line number Diff line number Diff line
@@ -1661,7 +1661,9 @@ static void adm8211_tx_raw(struct ieee80211_hw *dev, struct sk_buff *skb, 
}



/* Put adm8211_tx_hdr on skb and transmit */

static void adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb)

static void adm8211_tx(struct ieee80211_hw *dev,

		       struct ieee80211_tx_control *control,

		       struct sk_buff *skb)

{

	struct adm8211_tx_hdr *txhdr;

	size_t payload_len, hdrlen;

drivers/net/wireless/at76c50x-usb.c

+3 −1
Original line number Diff line number Diff line
@@ -1726,7 +1726,9 @@ static void at76_mac80211_tx_callback(struct urb *urb) 
	ieee80211_wake_queues(priv->hw);

}



static void at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb)

static void at76_mac80211_tx(struct ieee80211_hw *hw,

			     struct ieee80211_tx_control *control,

			     struct sk_buff *skb)

{

	struct at76_priv *priv = hw->priv;

	struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer;

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ 
\********************/



static void

ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)

ath5k_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,

	 struct sk_buff *skb)

{

	struct ath5k_hw *ah = hw->priv;

	u16 qnum = skb_get_queue_mapping(skb);

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ struct ath_tx_control { 
	struct ath_txq *txq;

	struct ath_node *an;

	u8 paprd;

	struct ieee80211_sta *sta;

};



#define ATH_TX_ERROR        0x01

drivers/net/wireless/ath/ath9k/htc.h

+1 −0
Original line number Diff line number Diff line
@@ -542,6 +542,7 @@ void ath9k_htc_stop_ani(struct ath9k_htc_priv *priv); 


int ath9k_tx_init(struct ath9k_htc_priv *priv);

int ath9k_htc_tx_start(struct ath9k_htc_priv *priv,

		       struct ieee80211_sta *sta,

		       struct sk_buff *skb, u8 slot, bool is_cab);

void ath9k_tx_cleanup(struct ath9k_htc_priv *priv);

bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv, int subtype);