From patchwork Tue May 1 18:23:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 8335 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 12F5523E23 for ; Tue, 1 May 2012 18:23:36 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id D47ADA181B1 for ; Tue, 1 May 2012 18:23:35 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id l4so2642925yen.11 for ; Tue, 01 May 2012 11:23:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=uuEsweyg5Emf6rFQHXznX3o99D3ovu0qa+nYUBkC61o=; b=GnZZLg5tTxpb2AbyPzcONP0hlVv3KWEzr7Vxl0ZkIumHHquPGt9XvNmAmtHSuHVh0q yV30xRVUxWSP728x0KLR2rfQTi9LJTSE0AghbOkv0fRcWy/NSjgvq/72eDLWY8DIDTER JzdLBRHOc2bVqVoizYFy8YSspT/ZD/gjy+M+QUWZJOnH+/PR270rk54sY+IkF7Flnciq c1PcXjcjpfWtiF0gFTxmRvdgFqWIdMQ0+MyAnXb3DKBUuBB06XGrcsj1DmWvR0PAPBbc Dbtjb0oR6qxZ6Ia8pOTJlEP2niq288PajZNjz6GdJnDB/QF5gAYgUqEhvVpvrOweohp6 Cs7w== Received: by 10.50.217.230 with SMTP id pb6mr2864753igc.1.1335896615477; Tue, 01 May 2012 11:23:35 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.137.198 with SMTP id x6csp198022ibt; Tue, 1 May 2012 11:23:34 -0700 (PDT) Received: by 10.152.135.43 with SMTP id pp11mr22270869lab.24.1335896614189; Tue, 01 May 2012 11:23:34 -0700 (PDT) Received: from mail.df.lth.se (mail.df.lth.se. [194.47.250.12]) by mx.google.com with ESMTPS id ft1si10060492lbb.55.2012.05.01.11.23.33 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 01 May 2012 11:23:34 -0700 (PDT) Received-SPF: neutral (google.com: 194.47.250.12 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=194.47.250.12; Authentication-Results: mx.google.com; spf=neutral (google.com: 194.47.250.12 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) smtp.mail=linus.walleij@linaro.org Received: from fecusia (c83-249-217-212.bredband.comhem.se [83.249.217.212]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.df.lth.se (Postfix) with ESMTPSA id DD35965D55; Tue, 1 May 2012 20:23:31 +0200 (CEST) Received: by fecusia (sSMTP sendmail emulation); Tue, 1 May 2012 20:23:31 +0200 From: "Linus Walleij" To: netdev@vger.kernel.org, linux-usb@vger.kernel.org, Greg Kroah-Hartman , "David S. Miller" , Felipe Balbi Cc: Jussi Kivilinna , Haiyang Zhang , Wei Yongjun , Ben Hutchings , Linus Walleij Subject: [PATCH 10/13 v4] usb/net: rndis: move and namespace PnP defines Date: Tue, 1 May 2012 20:23:30 +0200 Message-Id: <1335896610-13593-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.7.7.6 X-Gm-Message-State: ALoCoQkTCBapX+C7akRr2LBBnn5Q5WgJFraYpOk3aNY/GqEZQgAziOyqFw9c1IQqDN5xSVc5gb3Q This moves the PnP OID definitions to the RNDIS_* namespace and puts them in the next falling slot in the list. Oh, the comment above the PnP defines was referring to some obsolete or out-of-tree driver so removed it, and removed my own comments telling where each header segment came from as well, we have moved everything around by this point anyway. Signed-off-by: Linus Walleij --- include/linux/rndis.h | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/include/linux/rndis.h b/include/linux/rndis.h index 83b3d70..bdad7ab 100644 --- a/include/linux/rndis.h +++ b/include/linux/rndis.h @@ -1,4 +1,7 @@ -/* From include/linux/usb/rndis_host.h */ +/* + * Remote Network Driver Interface Specification (RNDIS) + * definitions of the magic numbers used by this protocol + */ #define RNDIS_MSG_COMPLETION 0x80000000 @@ -148,8 +151,6 @@ #define RNDIS_PACKET_TYPE_FUNCTIONAL 0x00004000 #define RNDIS_PACKET_TYPE_MAC_FRAME 0x00008000 -/* From drivers/usb/gadget/ndis.h */ - /* NDIS_PNP_CAPABILITIES.Flags constants */ #define NDIS_DEVICE_WAKE_UP_ENABLE 0x00000001 #define NDIS_DEVICE_WAKE_ON_PATTERN_MATCH_ENABLE 0x00000002 @@ -194,8 +195,6 @@ #define NDIS_MAC_OPTION_8021P_PRIORITY 0x00000040 #define NDIS_MAC_OPTION_RESERVED 0x80000000 -/* From drivers/usb/gadget/rndis.h */ - /* Remote NDIS Versions */ #define RNDIS_MAJOR_VERSION 0x00000001 #define RNDIS_MINOR_VERSION 0x00000000 @@ -222,16 +221,6 @@ #define RNDIS_DF_CONNECTION_ORIENTED 0x00000002U #define RNDIS_DF_RAW_DATA 0x00000004U -/* from drivers/net/sk98lin/h/skgepnmi.h */ -#define OID_PNP_CAPABILITIES 0xFD010100 -#define OID_PNP_SET_POWER 0xFD010101 -#define OID_PNP_QUERY_POWER 0xFD010102 -#define OID_PNP_ADD_WAKE_UP_PATTERN 0xFD010103 -#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xFD010104 -#define OID_PNP_ENABLE_WAKE_UP 0xFD010106 - -/* From drivers/net/hyperv/hyperv_net.h */ - /* Object Identifiers used by NdisRequest Query/Set Information */ /* General (Required) Objects */ #define RNDIS_OID_GEN_SUPPORTED_LIST 0x00010101 @@ -396,6 +385,14 @@ #define RNDIS_OID_802_11_POWER_MODE 0x0d010216 #define RNDIS_OID_802_11_BSSID_LIST 0x0d010217 +/* Plug and Play capabilities */ +#define RNDIS_OID_PNP_CAPABILITIES 0xFD010100 +#define RNDIS_OID_PNP_SET_POWER 0xFD010101 +#define RNDIS_OID_PNP_QUERY_POWER 0xFD010102 +#define RNDIS_OID_PNP_ADD_WAKE_UP_PATTERN 0xFD010103 +#define RNDIS_OID_PNP_REMOVE_WAKE_UP_PATTERN 0xFD010104 +#define RNDIS_OID_PNP_ENABLE_WAKE_UP 0xFD010106 + #define REMOTE_CONDIS_MP_CREATE_VC_MSG 0x00008001 #define REMOTE_CONDIS_MP_DELETE_VC_MSG 0x00008002 #define REMOTE_CONDIS_MP_ACTIVATE_VC_MSG 0x00008005