diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-08-21 22:00:21 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-21 22:00:21 +0200 |
| commit | 01e17dacd47101ad7d33152bbfbbd4394352d2e6 (patch) | |
| tree | d94706b87fcad04d08a46a9b3555396d21ab41ec /drivers/net/wireless/ath/ath5k | |
| parent | p54: fix powerpc gcc warnings (diff) | |
| parent | mac80211: clean up ieee80211_subif_start_xmit (diff) | |
| download | linux-01e17dacd47101ad7d33152bbfbbd4394352d2e6.tar.xz linux-01e17dacd47101ad7d33152bbfbbd4394352d2e6.zip | |
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 @@ \********************/ 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); |