diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-06 14:19:18 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-06 14:19:18 -0500 |
| commit | a50f9d5ee0f81271be49d64801bee0dfe84c2127 (patch) | |
| tree | f98c2adf753ee9a18913f455da818c12e7e76df2 /drivers/net | |
| parent | b7e047358449f8eb5cba8197b42280b676b82e54 (diff) | |
| parent | 277d916fc2e959c3f106904116bb4f7b1148d47a (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index c72438bb2faf..a1b32ee9594a 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c | |||
| @@ -2011,7 +2011,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2, | |||
| 2011 | (hwsim_flags & HWSIM_TX_STAT_ACK)) { | 2011 | (hwsim_flags & HWSIM_TX_STAT_ACK)) { |
| 2012 | if (skb->len >= 16) { | 2012 | if (skb->len >= 16) { |
| 2013 | hdr = (struct ieee80211_hdr *) skb->data; | 2013 | hdr = (struct ieee80211_hdr *) skb->data; |
| 2014 | mac80211_hwsim_monitor_ack(txi->rate_driver_data[0], | 2014 | mac80211_hwsim_monitor_ack(data2->channel, |
| 2015 | hdr->addr2); | 2015 | hdr->addr2); |
| 2016 | } | 2016 | } |
| 2017 | txi->flags |= IEEE80211_TX_STAT_ACK; | 2017 | txi->flags |= IEEE80211_TX_STAT_ACK; |