diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-16 17:13:49 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-16 17:13:49 +1100 |
commit | b01a2179bfd76c9e79485d1e23938794ba7d6db9 (patch) | |
tree | 52f3ec0b949b03a5674446be75a226076fc3fc0c /drivers/staging/vt6656 | |
parent | 21365af7800fe8ff291da2d4a41d07af96562afd (diff) | |
parent | a614be9a8b28bdedd2778aa0b443dcee62443989 (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/comedi/drivers/ni_labpc_cs.c
drivers/staging/comedi/drivers/ni_mio_cs.c
Diffstat (limited to 'drivers/staging/vt6656')
-rw-r--r-- | drivers/staging/vt6656/baseband.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/device.h | 4 | ||||
-rw-r--r-- | drivers/staging/vt6656/hostap.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/kcompat.h | 39 | ||||
-rw-r--r-- | drivers/staging/vt6656/main_usb.c | 8 | ||||
-rw-r--r-- | drivers/staging/vt6656/rxtx.c | 2 | ||||
-rw-r--r-- | drivers/staging/vt6656/wcmd.c | 1 |
7 files changed, 2 insertions, 54 deletions
diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c index 820a7b8e6fb8..59a86e27f20d 100644 --- a/drivers/staging/vt6656/baseband.c +++ b/drivers/staging/vt6656/baseband.c @@ -46,7 +46,6 @@ #include "control.h" #include "datarate.h" #include "rndis.h" -#include "control.h" /*--------------------- Static Definitions -------------------------*/ static int msglevel =MSG_LEVEL_INFO; diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index b02ca2d66fee..8b541d1d0e23 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -44,7 +44,6 @@ #include <linux/timer.h> #include <linux/slab.h> #include <linux/interrupt.h> -#include <linux/version.h> #include <linux/string.h> #include <linux/wait.h> #include <linux/if_arp.h> @@ -88,7 +87,6 @@ // device specific // -#include "kcompat.h" #include "device_cfg.h" #include "ttype.h" #include "80211hdr.h" @@ -103,7 +101,7 @@ #include "card.h" /*--------------------- Export Definitions -------------------------*/ -#define VNT_USB_VENDOR_ID 0x160A +#define VNT_USB_VENDOR_ID 0x160a #define VNT_USB_PRODUCT_ID 0x3184 #define MAC_MAX_CONTEXT_REG (256+128) diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c index 0c8267a10078..1078d616c497 100644 --- a/drivers/staging/vt6656/hostap.c +++ b/drivers/staging/vt6656/hostap.c @@ -37,7 +37,6 @@ #include "baseband.h" #include "wpactl.h" #include "key.h" -#include "mac.h" #include "datarate.h" #define VIAWGET_HOSTAPD_MAX_BUF_SIZE 1024 diff --git a/drivers/staging/vt6656/kcompat.h b/drivers/staging/vt6656/kcompat.h deleted file mode 100644 index 2cf634ca67d6..000000000000 --- a/drivers/staging/vt6656/kcompat.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 1996, 2003 VIA Networking, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * - * File: kcompat.h - * - * Purpose: define kernel compatibility header - * - * Author: Lyndon Chen - * - * Date: Apr 8, 2002 - * - */ - -#ifndef _KCOMPAT_H -#define _KCOMPAT_H - -#include <linux/version.h> - -#ifndef HAVE_NETDEV_PRIV -#define netdev_priv(dev) (dev->priv) -#endif - -#endif - diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 05186110c029..3c1efaa6e4b6 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -64,11 +64,9 @@ #include "ioctl.h" #include "iwctl.h" #include "dpc.h" -#include "iocmd.h" #include "datarate.h" #include "rf.h" #include "firmware.h" -#include "mac.h" #include "rndis.h" #include "control.h" #include "channel.h" @@ -809,12 +807,6 @@ vntwusb_found1(struct usb_interface *intf, const struct usb_device_id *id) kfree(pDevice); return -ENODEV; } - //2008-0623-02<Remark>by MikeLiu - //2007-0821-01<Add>by MikeLiu - //#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21) - //usb_set_intfdata(intf, pDevice); - //SET_NETDEV_DEV(netdev, &intf->dev); - //#endif //2008-07-21-01<Add>by MikeLiu //register wpadev diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 94ddf8bab62b..d9fa36c95230 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -3153,7 +3153,7 @@ bRelayPacketSend ( } if (pDevice->bEnableHostWEP) { - if (uNodeIndex >= 0) { + if (uNodeIndex < MAX_NODE_NUM + 1) { pTransmitKey = &STempKey; pTransmitKey->byCipherSuite = pMgmt->sNodeDBTable[uNodeIndex].byCipherSuite; pTransmitKey->dwKeyIndex = pMgmt->sNodeDBTable[uNodeIndex].dwKeyIndex; diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 6912344fdfae..0464093ed840 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -48,7 +48,6 @@ #include "wmgr.h" #include "power.h" #include "wctl.h" -#include "card.h" #include "baseband.h" #include "control.h" #include "rxtx.h" |