Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fe8747e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: ethernet: qualcomm: rmnet: Track RSB/RSC byte counts"

parents 31be490b b206a495

drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, 2016-2019 The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 2016-2020 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -139,6 +139,10 @@ struct rmnet_coal_stats { 
	u64 coal_trans_invalid;

	struct rmnet_coal_close_stats close;

	u64 coal_veid[RMNET_MAX_VEID];

	u64 coal_tcp;

	u64 coal_tcp_bytes;

	u64 coal_udp;

	u64 coal_udp_bytes;

};



struct rmnet_priv_stats {

drivers/net/ethernet/qualcomm/rmnet/rmnet_descriptor.c

+7 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -809,11 +809,17 @@ rmnet_frag_segment_coal_data(struct rmnet_frag_descriptor *coal_desc, 


		th = (struct tcphdr *)((u8 *)iph + coal_desc->ip_len);

		coal_desc->trans_len = th->doff * 4;

		priv->stats.coal.coal_tcp++;

		priv->stats.coal.coal_tcp_bytes +=

			skb_frag_size(&coal_desc->frag);

	} else if (coal_desc->trans_proto == IPPROTO_UDP) {

		struct udphdr *uh;



		uh = (struct udphdr *)((u8 *)iph + coal_desc->ip_len);

		coal_desc->trans_len = sizeof(*uh);

		priv->stats.coal.coal_udp++;

		priv->stats.coal.coal_udp_bytes +=

			skb_frag_size(&coal_desc->frag);

		if (coal_desc->ip_proto == 4 && !uh->check)

			zero_csum = true;

	} else {

drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -220,6 +220,10 @@ static const char rmnet_gstrings_stats[][ETH_GSTRING_LEN] = { 
	"Coalescing packets over VEID1",

	"Coalescing packets over VEID2",

	"Coalescing packets over VEID3",

	"Coalescing TCP frames",

	"Coalescing TCP bytes",

	"Coalescing UDP frames",

	"Coalescing UDP bytes",

	"Uplink priority packets",

};