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

Commit b39ef695 authored Apr 08, 2019 by Subash Abhinov Kasiviswanathan Committed by Gerrit - the friendly Code Review server Apr 15, 2019

net: qualcomm: rmnet: Fix compilation errors seen on UML



Fix the trace include path and the qmi include featurization
to allow rmnet to compile on UML.
Also fix the incorrect copyright update.

CRs-Fixed: 2431435
Change-Id: Ifcdfef6fbb5f5eb7e5a760de97741f50db738368
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>

parent db9f2137

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -25,12 +25,10 @@
		#include "rmnet_vnd.h"
		#include "rmnet_map.h"
		#include "rmnet_handlers.h"
		#ifdef CONFIG_QCOM_QMI_HELPERS

		#include <soc/qcom/rmnet_qmi.h>
		#include <soc/qcom/qmi_rmnet.h>

		#endif

		#define RMNET_IP_VERSION_4 0x40
		#define RMNET_IP_VERSION_6 0x60
		#define CREATE_TRACE_POINTS

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

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2018-2019, 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
		@@ -474,5 +474,5 @@ TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",

		/* This part must be outside protection */
		#undef TRACE_INCLUDE_PATH
		#define TRACE_INCLUDE_PATH .
		#define TRACE_INCLUDE_PATH ../drivers/net/ethernet/qualcomm/rmnet
		#include <trace/define_trace.h>