diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-08-22 00:00:21 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-22 00:00:21 +0400 |
| commit | 01e17dacd47101ad7d33152bbfbbd4394352d2e6 (patch) | |
| tree | d94706b87fcad04d08a46a9b3555396d21ab41ec /drivers/net/wireless/ath/carl9170/carl9170.h | |
| parent | 22c5649eef0fc37532e20c14d2656b28ca708a69 (diff) | |
| parent | dcf33963c48e1959c83fda84e336dbb000eefa3f (diff) | |
| download | linux-01e17dacd47101ad7d33152bbfbbd4394352d2e6.tar.xz | |
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/carl9170/carl9170.h')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/carl9170.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h index 376be11161c0..8f0cbc35816f 100644 --- a/drivers/net/wireless/ath/carl9170/carl9170.h +++ b/drivers/net/wireless/ath/carl9170/carl9170.h @@ -577,7 +577,9 @@ void carl9170_rx(struct ar9170 *ar, void *buf, unsigned int len); void carl9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len); /* TX */ -void carl9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb); +void carl9170_op_tx(struct ieee80211_hw *hw, + struct ieee80211_tx_control *control, + struct sk_buff *skb); void carl9170_tx_janitor(struct work_struct *work); void carl9170_tx_process_status(struct ar9170 *ar, const struct carl9170_rsp *cmd); |