From patchwork Wed Sep 30 11:26:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7297201 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 13EEE9F1D5 for ; Wed, 30 Sep 2015 11:30:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 37F4D20687 for ; Wed, 30 Sep 2015 11:30:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 726E62066F for ; Wed, 30 Sep 2015 11:30:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932662AbbI3L3l (ORCPT ); Wed, 30 Sep 2015 07:29:41 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:54907 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933185AbbI3L1Q (ORCPT ); Wed, 30 Sep 2015 07:27:16 -0400 Received: from wuerfel.lan. ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue003) with ESMTPSA (Nemesis) id 0MV0nZ-1aAevt3UGz-00YRMS; Wed, 30 Sep 2015 13:27:04 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: y2038@lists.linaro.org, linux-kernel@vger.kernel.org, "David S. Miller" , Arnd Bergmann , Amitkumar Karwar , Nishant Sarmukadam , Kalle Valo , linux-wireless@vger.kernel.org Subject: [PATCH 04/12] mwifiex: use ktime_get_real for timestamping Date: Wed, 30 Sep 2015 13:26:34 +0200 Message-Id: <1443612402-3000775-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1443612402-3000775-1-git-send-email-arnd@arndb.de> References: <1443612402-3000775-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:I5hC0FNTrB8QBPkfiwaa2WkHjzAUfjyu/rYWeMqbJYeRooTN1GJ XRz6mWYPwg2RbKMv8SOfil9pE5HxXXK3YTavzqYL9gvWLlUDa0TB0BJS/7jDSKXf4qQMn5d n470xd/OFyYoagLZlN0hw5lh/VMm4hRqEbkIKpTXGOoBeEfoDpCk2HUSRxjoM6fnCK6J2NV 22i72CgId7jjIVdGoy9Ng== X-UI-Out-Filterresults: notjunk:1; V01:K0:xJKyA83udGo=:16PKmyXEt4UUwNpBv/k0Sf mRrGHOVA/jKVneNP2hR+GNR0lIXlV9/WaNbkQQgNvJw6a70DKRWnNCRRFZWsL1zz7oxjBJ4cw IrHSE+8IziNwL0PIMmDSMglUlbZN8k9/VUzOEgHU3R3K9mmj1zxzQUUK3b8yulZNWlHrGjvsI fBvFdyb/E8/1ZRF4M/obGwS+KJQkMmtbB8aQgeykTRGbj2nkzOCvkjpGsVajSz9QuDIHnCzmw fmxt2Bu236Yg74Zsifu+l3XAM4HH+miOwM9il/hfvPpMqmP5EDfBmtL6Zlv46aWh3JfCjl1h9 U+3nrkNAdwvA8qejols06JNFtGgc9c21Em/yljOnN0O1fWbiDoViao7eBmpGmwNBGTiI1JQVh A0igxUMhuthMcHlXck/WPVuifmLqNcH28UfExh7tH8QcL8DqKYL8W88N5zBx+wDON9lboikcs GIFnFB3h4HT0GDRlrwytZ2foF4JE8xPh1K8QuN7kEgXbxm3Nm8PgjhSyG+c3ZVB2sUiBqOgvo X8H6DUuSPPKlFGrt7EiWBYV/xQunwtuQ6UdT0kfUBJD/Wdh83v/15JKZ0q4uZKTkgq3tiPBzA NoiM46MiIKf0vJeZrRBMWQi9gVkkPrEKJWtzzsItH3cww41qDudEmxS2EWbodbJgi7usEyvgB mK4jXJmL7imEuSmqFLaw6hIZNjsF2u3jv8R9da822RJt1LSOeTDWlECYXeMjSl10Sv7g= Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The mwifiex_11n_aggregate_pkt() function creates a ktime_t from a timeval returned by do_gettimeofday, which is slow and causes an overflow in 2038 on 32-bit architectures. This solves both problems by using the appropriate ktime_get_real() function. Signed-off-by: Arnd Bergmann Cc: Amitkumar Karwar Cc: Nishant Sarmukadam Cc: Kalle Valo Cc: linux-wireless@vger.kernel.org Acked-by: Amitkumar Karwar --- drivers/net/wireless/mwifiex/11n_aggr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/mwifiex/11n_aggr.c index f7c717253a66..78853c51774d 100644 --- a/drivers/net/wireless/mwifiex/11n_aggr.c +++ b/drivers/net/wireless/mwifiex/11n_aggr.c @@ -173,7 +173,6 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, int pad = 0, aggr_num = 0, ret; struct mwifiex_tx_param tx_param; struct txpd *ptx_pd = NULL; - struct timeval tv; int headroom = adapter->iface_type == MWIFIEX_USB ? 0 : INTF_HEADER_LEN; skb_src = skb_peek(&pra_list->skb_head); @@ -203,8 +202,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, tx_info_aggr->flags |= MWIFIEX_BUF_FLAG_AGGR_PKT; skb_aggr->priority = skb_src->priority; - do_gettimeofday(&tv); - skb_aggr->tstamp = timeval_to_ktime(tv); + skb_aggr->tstamp = ktime_get_real(); do { /* Check if AMSDU can accommodate this MSDU */