From patchwork Sat May 12 08:16:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 8554 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 997A823EB5 for ; Sat, 12 May 2012 08:16:53 +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 62963A186A7 for ; Sat, 12 May 2012 08:16:53 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so4190006yen.11 for ; Sat, 12 May 2012 01:16:53 -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=D5L0YNSdHGHAQ5KF/PlcP3N4t0MZX65KAJ2P52DPMbE=; b=d7+Gtzqz6mEoa6cuout8PXE/e5DXRoaYhJj/lyERzoRG+1v4B97ln8oGTrslqqx69n 3RALJynXXtkkeMKAj/CTUU7nhYpsg8EWgt/IQ/8/EOf57DRd4qgkxelCnJYNX91lXeh9 ucl/F6+93O8jn2tpvaGxn2HcvEkhoCPbeQhICTdomHQ/R1JVBjeq2t+H/gZCWBM82ET7 /y+f6I4Vta/rEJYPCOdIRwcwlTWctp/TadzPKtvRlLOjMawCyUXDWGxWP83qsm9BBwFy mcM0nr0TVmTZ39KAhJeYkfc2nDL3EtEgpxDVcWC5GF9wmI35PxMKMpXWx85fPatmJyAG swsA== Received: by 10.50.181.164 with SMTP id dx4mr527983igc.1.1336810612626; Sat, 12 May 2012 01:16:52 -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.73.147 with SMTP id q19csp226506ibj; Sat, 12 May 2012 01:16:51 -0700 (PDT) Received: by 10.112.98.70 with SMTP id eg6mr454750lbb.13.1336810611080; Sat, 12 May 2012 01:16:51 -0700 (PDT) Received: from mail.df.lth.se (mail.df.lth.se. [194.47.250.12]) by mx.google.com with ESMTPS id et4si5587452lbb.51.2012.05.12.01.16.50 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 12 May 2012 01:16:50 -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-216-219.bredband.comhem.se [83.249.216.219]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.df.lth.se (Postfix) with ESMTPSA id BEBF165D90; Sat, 12 May 2012 10:16:48 +0200 (CEST) Received: by fecusia (sSMTP sendmail emulation); Sat, 12 May 2012 10:16:48 +0200 From: "Linus Walleij" To: netdev@vger.kernel.org, linux-usb@vger.kernel.org, "David S. Miller" , Greg Kroah-Hartman , Felipe Balbi Cc: Jussi Kivilinna , Haiyang Zhang , Wei Yongjun , Ben Hutchings , Linus Walleij Subject: [PATCH 09/17 v5] usb/net: rndis: delete duplicate packet types Date: Sat, 12 May 2012 10:16:47 +0200 Message-Id: <1336810607-2931-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.7.7.6 X-Gm-Message-State: ALoCoQnHs06KGDiwmcwNoSfvzrZKzseLNHTnfPj+89DSfJh9AP73LiIoGQzKG87UKUL3OL2Szrqg The NDIS_*-prefixed packet types have equivalent RNDIS_*- prefixed types, besides nothing in the kernel use these defines. Signed-off-by: Linus Walleij --- include/linux/rndis.h | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/include/linux/rndis.h b/include/linux/rndis.h index 4857959..83b3d70 100644 --- a/include/linux/rndis.h +++ b/include/linux/rndis.h @@ -185,19 +185,6 @@ #define NDIS_MINIPORT_SUPPORTS_CANCEL_SEND_PACKETS 0x00800000 #define NDIS_MINIPORT_64BITS_DMA 0x01000000 -#define NDIS_PACKET_TYPE_DIRECTED 0x00000001 -#define NDIS_PACKET_TYPE_MULTICAST 0x00000002 -#define NDIS_PACKET_TYPE_ALL_MULTICAST 0x00000004 -#define NDIS_PACKET_TYPE_BROADCAST 0x00000008 -#define NDIS_PACKET_TYPE_SOURCE_ROUTING 0x00000010 -#define NDIS_PACKET_TYPE_PROMISCUOUS 0x00000020 -#define NDIS_PACKET_TYPE_SMT 0x00000040 -#define NDIS_PACKET_TYPE_ALL_LOCAL 0x00000080 -#define NDIS_PACKET_TYPE_GROUP 0x00000100 -#define NDIS_PACKET_TYPE_ALL_FUNCTIONAL 0x00000200 -#define NDIS_PACKET_TYPE_FUNCTIONAL 0x00000400 -#define NDIS_PACKET_TYPE_MAC_FRAME 0x00000800 - #define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA 0x00000001 #define NDIS_MAC_OPTION_RECEIVE_SERIALIZED 0x00000002 #define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND 0x00000004