diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
| commit | 79d38f7d6cf545ff838dd5227869f3916d1d100d (patch) | |
| tree | 859c8071aab68fd32f36ffb9ebc04cf12db6e5e0 /drivers/net/wireless/b43legacy | |
| parent | 03f52a0a554210d5049eeed9f1bb29047dc807cb (diff) | |
| parent | 0751f8654602e4255f0b9c17784d8100d5896010 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
Diffstat (limited to 'drivers/net/wireless/b43legacy')
| -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 b8ffea6f5c64..849a28c80302 100644 --- a/drivers/net/wireless/b43legacy/xmit.c +++ b/drivers/net/wireless/b43legacy/xmit.c | |||
| @@ -557,7 +557,7 @@ void b43legacy_rx(struct b43legacy_wldev *dev, | |||
| 557 | status.mactime += mactime; | 557 | status.mactime += mactime; |
| 558 | if (low_mactime_now <= mactime) | 558 | if (low_mactime_now <= mactime) |
| 559 | status.mactime -= 0x10000; | 559 | status.mactime -= 0x10000; |
| 560 | status.flag |= RX_FLAG_MACTIME_MPDU; | 560 | status.flag |= RX_FLAG_MACTIME_START; |
| 561 | } | 561 | } |
| 562 | 562 | ||
| 563 | chanid = (chanstat & B43legacy_RX_CHAN_ID) >> | 563 | chanid = (chanstat & B43legacy_RX_CHAN_ID) >> |