diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-08-21 16:00:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-08-21 16:00:21 -0400 |
commit | 01e17dacd47101ad7d33152bbfbbd4394352d2e6 (patch) | |
tree | d94706b87fcad04d08a46a9b3555396d21ab41ec /drivers/net/wireless/ath/ath5k | |
parent | 22c5649eef0fc37532e20c14d2656b28ca708a69 (diff) | |
parent | dcf33963c48e1959c83fda84e336dbb000eefa3f (diff) |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/mac80211_hwsim.c
Diffstat (limited to 'drivers/net/wireless/ath/ath5k')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/mac80211-ops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c index 92ee3a0a5192..c89fa6ead615 100644 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c | |||
@@ -55,7 +55,8 @@ | |||
55 | \********************/ | 55 | \********************/ |
56 | 56 | ||
57 | static void | 57 | static void |
58 | ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 58 | ath5k_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, |
59 | struct sk_buff *skb) | ||
59 | { | 60 | { |
60 | struct ath5k_hw *ah = hw->priv; | 61 | struct ath5k_hw *ah = hw->priv; |
61 | u16 qnum = skb_get_queue_mapping(skb); | 62 | u16 qnum = skb_get_queue_mapping(skb); |