summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNishant Sarmukadam <nishants@marvell.com>2012-11-06 17:53:15 +0400
committerJohn W. Linville <linville@tuxdriver.com>2012-11-14 23:56:12 +0400
commitb8d9e572cb8794335fb4ba63ff962acaa3c4473b (patch)
treeb64d7c0995178e631392ba4a553be8c2e3be42c5
parente1f4d69b631468d915a9ed4a0a64dba77705492d (diff)
downloadlinux-b8d9e572cb8794335fb4ba63ff962acaa3c4473b.tar.xz
mwl8k: Set packet timestamp to 0 when life time expiry is not used
Set tx packet timestamp to 0 in following scenarios:- - All packets in STA mode - Mgmt packets in AP mode - Eapol packets in AP mode In STA mode, this field is unused in the firmware. In AP mode, we should not be expiring mgmt and eapol frames. Setting timestamp to 0 will ensure that. Signed-off-by: Nishant Sarmukadam <nishants@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/mwl8k.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index a4d3dcbc1e31..3db495090e55 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -2033,6 +2033,8 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw,
if (priv->ap_fw && ieee80211_is_data(wh->frame_control) && !eapol_frame)
tx->timestamp = cpu_to_le32(ioread32(priv->regs +
MWL8K_HW_TIMER_REGISTER));
+ else
+ tx->timestamp = 0;
wmb();
tx->status = cpu_to_le32(MWL8K_TXD_STATUS_FW_OWNED | txstatus);