From patchwork Tue Jul 12 11:40:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: weiyj_lk@163.com X-Patchwork-Id: 9225157 X-Patchwork-Delegate: luca@coelho.fi Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 176F160572 for ; Tue, 12 Jul 2016 11:41:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 077142787D for ; Tue, 12 Jul 2016 11:41:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F076727E63; Tue, 12 Jul 2016 11:41:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6820F2787D for ; Tue, 12 Jul 2016 11:41:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753220AbcGLLlR (ORCPT ); Tue, 12 Jul 2016 07:41:17 -0400 Received: from m12-17.163.com ([220.181.12.17]:33671 "EHLO m12-17.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751187AbcGLLlQ (ORCPT ); Tue, 12 Jul 2016 07:41:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=feWbg RJg/yI6y6+oW2/rYeSDkAFc1DK7ak4QHTfKKso=; b=d9+9gYr7/unKv8KuQ+HTD ASKCccrk7cNAV4i2QSDaMjCmplEd7yFTtaNwldQpxHgmfhlOYUJ88BH2DWpWx6Q7 GJJm/0+2NSTLNrk1TxJyPJ65fkaQ0A8hxDjAsFIx2HCruQke0W66xVFfWCtPuXX6 e/dlvs6suh1d1XhkG3GzzM= Received: from localhost.localdomain.localdomain (unknown [180.110.253.144]) by smtp13 (Coremail) with SMTP id EcCowAB3EWBK14RXNIuQAg--.12525S2; Tue, 12 Jul 2016 19:40:58 +0800 (CST) From: weiyj_lk@163.com To: Johannes Berg , Emmanuel Grumbach , Luca Coelho , Intel Linux Wireless , Kalle Valo , Sara Sharon Cc: Wei Yongjun , linux-wireless@vger.kernel.org Subject: [PATCH -next] iwlwifi: mvm: use setup_timer instead of init_timer and data fields Date: Tue, 12 Jul 2016 11:40:57 +0000 Message-Id: <1468323657-5909-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-CM-TRANSID: EcCowAB3EWBK14RXNIuQAg--.12525S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7WryUCF45Kr4xZFW8KF13XFb_yoW8Jr45pa yUWr42kr1Utw4xK348AFZ5u3s0qan3AaykKa1Ikw45Zr1IkF13Ja1jqFyDAa4FkrWDJF12 qFn5Xr90gFnxKrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jgXo7UUUUU= X-Originating-IP: [180.110.253.144] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/1tbiGQqk1lXlT1FDtgAAs6 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun Use setup_timer function instead of initializing timer with the function and data fields Signed-off-by: Wei Yongjun --- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c index f449ef9..7caad55 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c @@ -1351,11 +1351,9 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta, baid_data->baid = baid; baid_data->timeout = timeout; baid_data->last_rx = jiffies; - init_timer(&baid_data->session_timer); - baid_data->session_timer.function = - iwl_mvm_rx_agg_session_expired; - baid_data->session_timer.data = - (unsigned long)&mvm->baid_map[baid]; + setup_timer(&baid_data->session_timer, + iwl_mvm_rx_agg_session_expired, + (unsigned long)&mvm->baid_map[baid]); baid_data->mvm = mvm; baid_data->tid = tid; baid_data->sta_id = mvm_sta->sta_id;