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

Commit 7d2d47d0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: rmnet: Make code changes with respect to CR#2046006"

parents 6f30ba37 5bcb0cda

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -1433,6 +1433,8 @@ static int ipa_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 




	/*  Extended IOCTLs  */

	/*  Extended IOCTLs  */

	case RMNET_IOCTL_EXTENDED:

	case RMNET_IOCTL_EXTENDED:

		if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))

			return -EPERM;

		IPAWANDBG("get ioctl: RMNET_IOCTL_EXTENDED\n");

		IPAWANDBG("get ioctl: RMNET_IOCTL_EXTENDED\n");

		if (copy_from_user(&extend_ioctl_data,

		if (copy_from_user(&extend_ioctl_data,

			(u8 *)ifr->ifr_ifru.ifru_data,

			(u8 *)ifr->ifr_ifru.ifru_data,

drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1565,6 +1565,8 @@ static int ipa3_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 




	/*  Extended IOCTLs  */

	/*  Extended IOCTLs  */

	case RMNET_IOCTL_EXTENDED:

	case RMNET_IOCTL_EXTENDED:

		if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))

			return -EPERM;

		IPAWANDBG("get ioctl: RMNET_IOCTL_EXTENDED\n");

		IPAWANDBG("get ioctl: RMNET_IOCTL_EXTENDED\n");

		if (copy_from_user(&extend_ioctl_data,

		if (copy_from_user(&extend_ioctl_data,

			(u8 *)ifr->ifr_ifru.ifru_data,

			(u8 *)ifr->ifr_ifru.ifru_data,