From patchwork Wed Oct 11 06:45:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 9998755 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 76F3B602BF for ; Wed, 11 Oct 2017 06:46:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60C4C2890E for ; Wed, 11 Oct 2017 06:46:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 55A7928911; Wed, 11 Oct 2017 06:46:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC3B52890E for ; Wed, 11 Oct 2017 06:46:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756679AbdJKGpd (ORCPT ); Wed, 11 Oct 2017 02:45:33 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:48616 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756580AbdJKGpb (ORCPT ); Wed, 11 Oct 2017 02:45:31 -0400 Received: by mail-pf0-f170.google.com with SMTP id b79so654365pfk.5 for ; Tue, 10 Oct 2017 23:45:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RijD6igbTEBvJnMMJXStHeiIgf820aIMkYoEuuRjLdE=; b=gS6Sd2mUwDCvit9wrcGdHkxDSuugTybW1msmXmNI4yja3+or0w14jJhPQimTnaMeNJ U2TRDRTrkD9lD7fUy8LnmN6GsyzhUVjOBS/bBCuJwolVnRds4ySiDEpC3C1U+ziWw8So 38zCPWKwe9z7CIS2xux+F1tZqvTvrvOfsfmV0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RijD6igbTEBvJnMMJXStHeiIgf820aIMkYoEuuRjLdE=; b=O/qPyVKKjzVy5obOGXJXyJBUb5SAH9QGzjeFsQa8OfTJOWvOCWLvx6V0XpEGL1B3Wc 70woU/MdAilB/CqsN7hl6fO+tic9GfMEHtbF3wK2jupfQlsLZB8uQYrElhj7DoPFs5aC KNoW0SY9eQNP9BnA5allCcvoOwSn9DKvlahYMP4Ld+CsJN/p9hpgiGS7mIPOs0lRfa7+ oL9MVcdGtRmxLuejzs09QtJwwGzxQFJFDQuErXgn2mBMFu+/Mi2Ra35khlFDZ+tQabPw WbfD3cPF98huqcFLq2lCOHqzjA08ugOO9Wp9D+0Z71Eu0op/Y2GSpQEtFaL84HxUvg8f IPgw== X-Gm-Message-State: AMCzsaXXBH5Cnhg1EStBfr+8JdqHqLghmJ/HYPViTgYFg6ynl9wwt88J pffjGxvIwqgZiw4EL8B62ZNwVA== X-Google-Smtp-Source: AOwi7QDqfHWBnVRUUYVOj6/H7/JTxtnAg15Sx4aaOTquolPgAgdMRY3i1ssRgO4XSfbAfrMYvQeRlQ== X-Received: by 10.99.99.65 with SMTP id x62mr14627376pgb.221.1507704330544; Tue, 10 Oct 2017 23:45:30 -0700 (PDT) Received: from localhost.localdomain (ip68-111-217-79.sd.sd.cox.net. [68.111.217.79]) by smtp.gmail.com with ESMTPSA id l79sm411779pfb.33.2017.10.10.23.45.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Oct 2017 23:45:29 -0700 (PDT) From: Bjorn Andersson To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Chris Lew Subject: [PATCH v2 3/7] net: qrtr: Add control packet definition to uapi Date: Tue, 10 Oct 2017 23:45:19 -0700 Message-Id: <20171011064523.7902-4-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20171011064523.7902-1-bjorn.andersson@linaro.org> References: <20171011064523.7902-1-bjorn.andersson@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The QMUX protocol specification defines structure of the special control packet messages being sent between handlers of the control port. Add these to the uapi header, as this structure and the associated types are shared between the kernel and all userspace handlers of control messages. Signed-off-by: Bjorn Andersson --- Changes since v1: - None include/uapi/linux/qrtr.h | 32 ++++++++++++++++++++++++++++++++ net/qrtr/qrtr.c | 12 ------------ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/include/uapi/linux/qrtr.h b/include/uapi/linux/qrtr.h index 63e8803e4d90..179af64846e0 100644 --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h @@ -13,4 +13,36 @@ struct sockaddr_qrtr { __u32 sq_port; }; +enum qrtr_pkt_type { + QRTR_TYPE_DATA = 1, + QRTR_TYPE_HELLO = 2, + QRTR_TYPE_BYE = 3, + QRTR_TYPE_NEW_SERVER = 4, + QRTR_TYPE_DEL_SERVER = 5, + QRTR_TYPE_DEL_CLIENT = 6, + QRTR_TYPE_RESUME_TX = 7, + QRTR_TYPE_EXIT = 8, + QRTR_TYPE_PING = 9, + QRTR_TYPE_NEW_LOOKUP = 10, + QRTR_TYPE_DEL_LOOKUP = 11, +}; + +struct qrtr_ctrl_pkt { + __le32 cmd; + + union { + struct { + __le32 service; + __le32 instance; + __le32 node; + __le32 port; + } server; + + struct { + __le32 node; + __le32 port; + } client; + }; +} __packed; + #endif /* _LINUX_QRTR_H */ diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index 15981abc042c..d85ca7170b8f 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -26,18 +26,6 @@ #define QRTR_MIN_EPH_SOCKET 0x4000 #define QRTR_MAX_EPH_SOCKET 0x7fff -enum qrtr_pkt_type { - QRTR_TYPE_DATA = 1, - QRTR_TYPE_HELLO = 2, - QRTR_TYPE_BYE = 3, - QRTR_TYPE_NEW_SERVER = 4, - QRTR_TYPE_DEL_SERVER = 5, - QRTR_TYPE_DEL_CLIENT = 6, - QRTR_TYPE_RESUME_TX = 7, - QRTR_TYPE_EXIT = 8, - QRTR_TYPE_PING = 9, -}; - /** * struct qrtr_hdr - (I|R)PCrouter packet header * @version: protocol version