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

Commit 95553f1b authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: arm: sdxprairie: Enable rmnet driver"

parents 49c8bbfc fe0045dd

arch/arm/configs/vendor/sdxprairie-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ CONFIG_TUN=y 
CONFIG_KS8851=y

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

CONFIG_RMNET=y

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

arch/arm/configs/vendor/sdxprairie_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ CONFIG_TUN=y 
CONFIG_KS8851=y

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

CONFIG_RMNET=y

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

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

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ struct rmnet_port_priv_stats { 
	u64 dl_hdr_count;

	u64 dl_hdr_total_bytes;

	u64 dl_hdr_total_pkts;

	u64 dl_hdr_avg_bytes;

	u64 dl_hdr_avg_pkts;

	u64 dl_trl_last_seq;

	u64 dl_trl_count;

};

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

+0 −9
Original line number Diff line number Diff line
@@ -143,15 +143,6 @@ static void rmnet_map_process_flow_start(struct sk_buff *skb, 
	port->stats.dl_hdr_total_pkts += port->stats.dl_hdr_last_pkts;

	port->stats.dl_hdr_count++;



	if (unlikely(!(port->stats.dl_hdr_count)))

		port->stats.dl_hdr_count = 1;



	port->stats.dl_hdr_avg_bytes = port->stats.dl_hdr_total_bytes /

				       port->stats.dl_hdr_count;



	port->stats.dl_hdr_avg_pkts = port->stats.dl_hdr_total_pkts /

				      port->stats.dl_hdr_count;



	rmnet_map_dl_hdr_notify(port, dlhdr);

	if (rmnet_perf) {

		unsigned int pull_size;

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

+0 −2
Original line number Diff line number Diff line
@@ -208,8 +208,6 @@ static const char rmnet_port_gstrings_stats[][ETH_GSTRING_LEN] = { 
	"DL header pkts received",

	"DL header total bytes received",

	"DL header total pkts received",

	"DL header average bytes",

	"DL header average packets",

	"DL trailer last seen sequence",

	"DL trailer pkts received",

};