Merge "msm: ipa: Add support IPA_IOC_GET_HW_VERSION in config_compat" (6ec5f985) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/platform/msm/ipa/ipa_v2/ipa.c

+7 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, 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
		@@ -167,6 +167,9 @@
		#define IPA_IOC_MDFY_RT_RULE32 _IOWR(IPA_IOC_MAGIC, \
		IPA_IOCTL_MDFY_RT_RULE, \
		compat_uptr_t)
		#define IPA_IOC_GET_HW_VERSION32 _IOWR(IPA_IOC_MAGIC, \
		IPA_IOCTL_GET_HW_VERSION, \
		compat_uptr_t)

		/**
		* struct ipa_ioc_nat_alloc_mem32 - nat table memory allocation
		@@ -3006,6 +3009,9 @@ long compat_ipa_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
		case IPA_IOC_MDFY_RT_RULE32:
		cmd = IPA_IOC_MDFY_RT_RULE;
		break;
		case IPA_IOC_GET_HW_VERSION32:
		cmd = IPA_IOC_GET_HW_VERSION;
		break;
		case IPA_IOC_COMMIT_HDR:
		case IPA_IOC_RESET_HDR:
		case IPA_IOC_COMMIT_RT:

+4 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2015, 2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2015, 2018, 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
		@@ -328,6 +328,9 @@ long compat_wan_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
		case WAN_IOC_QUERY_DL_FILTER_STATS32:
		cmd = WAN_IOC_QUERY_DL_FILTER_STATS;
		break;
		case WAN_IOC_QUERY_TETHER_STATS_ALL32:
		cmd = WAN_IOC_QUERY_TETHER_STATS_ALL;
		break;
		default:
		return -ENOIOCTLCMD;
		}