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

Commit 6478baf6 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge e7cdcf9e on remote branch 

Change-Id: I62c77db0dbea5fdd963e8321193d680033bdf944
parents 5fabfa77 e7cdcf9e

core/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ ifneq ($(TARGET_PRODUCT),qssi) 
RMNET_CORE_DLKM_PLATFORMS_LIST := lahaina

RMNET_CORE_DLKM_PLATFORMS_LIST += holi

RMNET_CORE_DLKM_PLATFORMS_LIST += monaco

RMNET_CORE_DLKM_PLATFORMS_LIST += monaco_go

RMNET_CORE_DLKM_PLATFORMS_LIST += monaco_go_aon



ifeq ($(call is-board-platform-in-list, $(RMNET_CORE_DLKM_PLATFORMS_LIST)),true)

#Make file to create RMNET_CORE DLKM

core/rmnet_config.c

+8 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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
@@ -641,6 +642,7 @@ EXPORT_SYMBOL(rmnet_init_qmi_pt); 


void rmnet_get_packets(void *port, u64 *rx, u64 *tx)

{

	struct net_device *dev;

	struct rmnet_priv *priv;

	struct rmnet_pcpu_stats *ps;

	unsigned int cpu, start;
@@ -654,8 +656,12 @@ void rmnet_get_packets(void *port, u64 *rx, u64 *tx) 
	*tx = 0;

	*rx = 0;

	rcu_read_lock();

	hash_for_each(((struct rmnet_port *)port)->muxed_ep, bkt, ep, hlnode) {

		priv = netdev_priv(ep->egress_dev);

	hash_for_each_rcu(((struct rmnet_port *)port)->muxed_ep, bkt, ep,

			  hlnode) {

		dev = ep->egress_dev;

		if (!dev)

			continue;

		priv = netdev_priv(dev);

		for_each_possible_cpu(cpu) {

			ps = per_cpu_ptr(priv->pcpu_stats, cpu);

			do {

datarmnet_dlkm_vendor_board.mk

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
DATA_DLKM_BOARD_PLATFORMS_LIST := lahaina

DATA_DLKM_BOARD_PLATFORMS_LIST += holi

DATA_DLKM_BOARD_PLATFORMS_LIST += monaco

DATA_DLKM_BOARD_PLATFORMS_LIST += monaco_go

DATA_DLKM_BOARD_PLATFORMS_LIST += monaco_go_aon

ifneq ($(TARGET_BOARD_AUTO),true)

ifeq ($(call is-board-platform-in-list,$(DATA_DLKM_BOARD_PLATFORMS_LIST)),true)

BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/rmnet_core.ko