From patchwork Wed Apr 22 14:46:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 6256621 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 29CCEBF4A6 for ; Wed, 22 Apr 2015 14:46:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3E1E220303 for ; Wed, 22 Apr 2015 14:46:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D310202D1 for ; Wed, 22 Apr 2015 14:46:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933901AbbDVOqi (ORCPT ); Wed, 22 Apr 2015 10:46:38 -0400 Received: from s3.sipsolutions.net ([5.9.151.49]:55107 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933659AbbDVOqi (ORCPT ); Wed, 22 Apr 2015 10:46:38 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.84) (envelope-from ) id 1YkvvA-0008SD-Gf; Wed, 22 Apr 2015 16:46:36 +0200 From: Johannes Berg To: linux-wireless@vger.kernel.org Cc: Johannes Berg Subject: [PATCH] mac80211: don't update dev->trans_start Date: Wed, 22 Apr 2015 16:46:34 +0200 Message-Id: <1429713994-17828-1-git-send-email-johannes@sipsolutions.net> X-Mailer: git-send-email 2.1.4 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 From: Johannes Berg This isn't necessary any more as the stack will automatically update the TXQ's trans_start after calling ndo_start_xmit(). Signed-off-by: Johannes Berg --- net/mac80211/tx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index df62942653ad..83e3261dbf67 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2729,7 +2729,6 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata, dev->stats.tx_packets++; dev->stats.tx_bytes += skb->len + extra_head; - dev->trans_start = jiffies; /* will not be crypto-handled beyond what we do here, so use false * as the may-encrypt argument for the resize to not account for @@ -2912,7 +2911,6 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, dev->stats.tx_packets++; dev->stats.tx_bytes += skb->len; - dev->trans_start = jiffies; ieee80211_xmit(sdata, sta, skb); }