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

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

Merge "soc: qcom: glink_pkt: Add intent ioctl handling" into msm-4.14

parents 3adedff5 1891d02a
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ do { \
	sigs &= 0x0fff; \
} while (0)

#define GLINK_PKT_IOCTL_MAGIC (0xC3)

#define GLINK_PKT_IOCTL_QUEUE_RX_INTENT \
	_IOW(GLINK_PKT_IOCTL_MAGIC, 0, unsigned int)

#define MODULE_NAME "glink_pkt"
static dev_t glink_pkt_major;
@@ -588,9 +592,10 @@ static long glink_pkt_ioctl(struct file *file, unsigned int cmd,
	case TIOCMBIC:
		ret = glink_pkt_tiocmset(gpdev, cmd, arg);
		break;
	/*
	 * Need to add support later any intent requirements.
	 */
	case GLINK_PKT_IOCTL_QUEUE_RX_INTENT:
		/* Return success to not break userspace client logic */
		ret = 0;
		break;
	default:
		GLINK_PKT_ERR("unrecognized ioctl command 0x%x\n", cmd);
		ret = -ENOIOCTLCMD;