From patchwork Mon Feb 26 03:12:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 877670 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rG2MMHUQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zqRhL2vntz9s1s for ; Mon, 26 Feb 2018 14:12:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752017AbeBZDMP (ORCPT ); Sun, 25 Feb 2018 22:12:15 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36134 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751945AbeBZDMN (ORCPT ); Sun, 25 Feb 2018 22:12:13 -0500 Received: by mail-pg0-f66.google.com with SMTP id i14so761384pgv.3 for ; Sun, 25 Feb 2018 19:12:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=GfooP4EI2aCmU2LW5okcGnKNOaX40jFoI4O8wDQz5SA=; b=rG2MMHUQtadvQCx0PC57mpmt4iCNZFgbnxr+x2p95scpMCjUSy8q+2QwPv1UPkW0tK A1Wo3zh48JFrSruiiihKnrmxkeHgboFovLiuRMDUFLYBn6sjKtyQX4FH+NAX4MlCFT89 rmnIkPypxQImTLf4YByRzTM+iNfIvo3DBKFZZY2SoOu/0M7KSq46s4QwD54u1V+IA6i8 xRWAWBEAtqMggN3Uv4twTDYLwxyCfK29LnIW6ZaF3DbWhOQlKKFM2LmccG4kdcjcMwzv tV792a9mHdc5OjQhzbFZjMZvZ2Lng3FlV4FylXVzZRfxjo46VzUEyq4agCahF9dJomkT wVHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=GfooP4EI2aCmU2LW5okcGnKNOaX40jFoI4O8wDQz5SA=; b=UaThotv4/HGCQ/HDdduNgu1Ma9zkIxZyTMOQD3kceTM1tPnVMgKmWsTD/2VH9uF6Be da0rpXZDGKjbttNaHab2Cp0fR2nRBXSvXvjtztZpVhBS0n6gcNwgh2VDwdZjfE6vafBy wz+ja2TxIADwYOwI/wW5BPkuanp0PdomcsudOQh9ZGeTPpTFSusBG2w+vKgrgxlxmvkA Upwtw78vxbFJsozl3FXnN+zD02JrBrGna6T9EFA62NUWLWIuKZkz+B7pEBWexY69Z0Py OcWkMo1ZkD0q/j7vQqSq7DQMJBWvXZ4pKJKaGJl+GTkeYV9IjOuviGd4TjZypJD+MTHu uvVQ== X-Gm-Message-State: APf1xPBWEn91jv28kyB2zt5srgSK+mUAbt5yr5hB+8oYrQHaIZ9V+jj3 e7CLsZnZf2/UJnIKkz5kPRU= X-Google-Smtp-Source: AH8x226qNGvjeJ9xMTQgQw8KayTNnkwyEl8HyVBgqpdhXYX3IlKlVfi7XdS2ONPYNUFlnw2ioPLBVA== X-Received: by 10.99.53.193 with SMTP id c184mr7151374pga.180.1519614733004; Sun, 25 Feb 2018 19:12:13 -0800 (PST) Received: from edumazet-glaptop3.lan (c-67-180-167-114.hsd1.ca.comcast.net. [67.180.167.114]) by smtp.googlemail.com with ESMTPSA id c62sm15764889pfk.127.2018.02.25.19.12.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 Feb 2018 19:12:12 -0800 (PST) Message-ID: <1519614730.3258.7.camel@gmail.com> Subject: [PATCH net] r8152: fix tx packets accounting From: Eric Dumazet To: David Miller Cc: netdev , Hayes Wang Date: Sun, 25 Feb 2018 19:12:10 -0800 X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet r8152 driver handles TSO packets (limited to ~16KB) quite well, but pretends each TSO logical packet is a single packet on the wire. There is also some error since headers are accounted once, but error rate is small enough that we do not care. Signed-off-by: Eric Dumazet ---  drivers/net/usb/r8152.c |    2 +-  1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 958b2e8b90f689249abfea6c713e491300a7dc94..86f7196f9d91fbf55c791fff88687a43518d66d8 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -1794,7 +1794,7 @@ static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg) tx_data += len; agg->skb_len += len; - agg->skb_num++; + agg->skb_num += skb_shinfo(skb)->gso_segs ?: 1; dev_kfree_skb_any(skb);