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 | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth (diff) | |
| parent | mac80211: move "bufferable MMPDU" check to fix AP mode scan (diff) | |
| download | linux-dev-a50f9d5ee0f81271be49d64801bee0dfe84c2127.tar.xz linux-dev-a50f9d5ee0f81271be49d64801bee0dfe84c2127.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'drivers')
| -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, (hwsim_flags & HWSIM_TX_STAT_ACK)) { if (skb->len >= 16) { hdr = (struct ieee80211_hdr *) skb->data; - mac80211_hwsim_monitor_ack(txi->rate_driver_data[0], + mac80211_hwsim_monitor_ack(data2->channel, hdr->addr2); } txi->flags |= IEEE80211_TX_STAT_ACK; |