diff options
| author |  John W. Linville <linville@tuxdriver.com>
| 2012-12-06 14:58:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com>
| 2012-12-06 14:58:41 -0500 |
| commit | 403e16731ffddc097eae89f53f9a7b0f0c9769c4 (patch) | |
| tree | 228d17985ad8ea22a7763457bf9641eb44781568 /net/mac80211/status.c | |
| parent | Merge tag 'nfc-fixes-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | cfg80211: fix channel error on mesh join (diff) | |
| download | linux-403e16731ffddc097eae89f53f9a7b0f0c9769c4.tar.gz linux-403e16731ffddc097eae89f53f9a7b0f0c9769c4.tar.bz2 linux-403e16731ffddc097eae89f53f9a7b0f0c9769c4.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/mwifiex/sta_ioctl.c
net/mac80211/scan.c
Diffstat (limited to 'net/mac80211/status.c')
| -rw-r--r-- | net/mac80211/status.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index ab63237107c8..ab50285fcbab 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -539,6 +539,9 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) sta->lost_packets = 0; } } + + if (acked) + sta->last_ack_signal = info->status.ack_signal; } rcu_read_unlock(); |