diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-04 21:48:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-04 21:48:25 +0100 |
| commit | d72751ede1b9bf993d7bd3377305c8e9e36a3cc4 (patch) | |
| tree | 27abaa49de7ff666dbf6bbcb0d7bae2b9f029a2d /drivers/net/wireless/b43legacy/xmit.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-d72751ede1b9bf993d7bd3377305c8e9e36a3cc4.tar.xz linux-d72751ede1b9bf993d7bd3377305c8e9e36a3cc4.zip | |
Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43legacy/xmit.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/xmit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c index 7d177d97f1f7..3a95541708a6 100644 --- a/drivers/net/wireless/b43legacy/xmit.c +++ b/drivers/net/wireless/b43legacy/xmit.c @@ -572,7 +572,7 @@ void b43legacy_rx(struct b43legacy_wldev *dev, status.mactime += mactime; if (low_mactime_now <= mactime) status.mactime -= 0x10000; - status.flag |= RX_FLAG_TSFT; + status.flag |= RX_FLAG_MACTIME_MPDU; } chanid = (chanstat & B43legacy_RX_CHAN_ID) >> |