From patchwork Sat Feb 15 22:00:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 3657211 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 40A42BF13A for ; Sat, 15 Feb 2014 22:00:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5590A20221 for ; Sat, 15 Feb 2014 22:00:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28B952021F for ; Sat, 15 Feb 2014 22:00:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752964AbaBOWAz (ORCPT ); Sat, 15 Feb 2014 17:00:55 -0500 Received: from mail-we0-f176.google.com ([74.125.82.176]:44781 "EHLO mail-we0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752729AbaBOWAy (ORCPT ); Sat, 15 Feb 2014 17:00:54 -0500 Received: by mail-we0-f176.google.com with SMTP id q58so9427968wes.7 for ; Sat, 15 Feb 2014 14:00:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:content-type:mime-version :content-transfer-encoding; bh=1yH7bn4N8pTEuUj49iccb11qCAlRjlz5qpvkAIv/7Xs=; b=Angy4Kf+dBYwqab2kdetcRikKaz3yUTG04vGlQAwiRQPguzvNMwLry6sW/6mIlJ+iX 8itjeDB7gt3+hS8HT2O9luwvslLcq78qB1XTcXOJrG/RLqqSsE+EISWAZt/8qNzacXu6 +jSIiHWBipPK7tk8P33fUQYLaPGwTTqwHtQCJyUIbs8XC/v5jJWDA38m3YL3y4x7u0ft jBxyao3/hwlaH4Oj8lqFNZ0zLteGoFK494MnCh+E/UrQAe+vTjxebb5LqDJfhlopxpGn kx6m+o/auVHTtldlmtUDuuEk0TEe+uFLgo1qsl6vVkskPQSa3YQZnJZeBMyM/fB3628n u0AQ== X-Received: by 10.194.175.202 with SMTP id cc10mr814979wjc.48.1392501653588; Sat, 15 Feb 2014 14:00:53 -0800 (PST) Received: from [192.168.1.100] (92.41.105.18.threembb.co.uk. [92.41.105.18]) by mx.google.com with ESMTPSA id ff7sm16935065wic.10.2014.02.15.14.00.51 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Sat, 15 Feb 2014 14:00:52 -0800 (PST) Message-ID: <1392501641.4022.7.camel@canaries32-MCP7A> Subject: [PATCH 3/3 RESEND] staging: vt6656: Remove typedef _VIA_BB_TYPE From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org Date: Sat, 15 Feb 2014 22:00:41 +0000 X-Mailer: Evolution 3.10.3-0ubuntu3 Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP BB_TYPE_11* are already defined in baseband.h as macros. assign variable as u8 type. iwctl.c needs the baseband.h header for the macros. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6656/device.h | 10 +--------- drivers/staging/vt6656/iwctl.c | 1 + 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index c195a9c..ec20b14 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -213,14 +213,6 @@ typedef struct { bool bInUse; } INT_BUFFER, *PINT_BUFFER; -/* 0:11A 1:11B 2:11G */ -typedef enum _VIA_BB_TYPE -{ - BB_TYPE_11A = 0, - BB_TYPE_11B, - BB_TYPE_11G -} VIA_BB_TYPE, *PVIA_BB_TYPE; - /*++ NDIS related */ typedef enum __DEVICE_NDIS_STATUS { @@ -540,7 +532,7 @@ struct vnt_private { u8 byCWMaxMin; /* Rate */ - VIA_BB_TYPE byBBType; /* 0: 11A, 1:11B, 2:11G */ + u8 byBBType; /* 0: 11A, 1:11B, 2:11G */ u8 byPacketType; /* 0:11a 1:11b 2:11gb 3:11ga */ u16 wBasicRate; u8 byACKRate; diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c index 23320cc..60264a6 100644 --- a/drivers/staging/vt6656/iwctl.c +++ b/drivers/staging/vt6656/iwctl.c @@ -41,6 +41,7 @@ #include "wpactl.h" #include "control.h" #include "rndis.h" +#include "baseband.h" static const long frequency_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484,