summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/device_main.c
diff options
context:
space:
mode:
authorAlexander Beregalov <a.beregalov@gmail.com>2009-07-04 23:09:32 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:01:36 -0700
commite882335bb19c0b9f96971fa6b1fe6c019280056b (patch)
tree01cdab131836c67e19ce4dddf8f74a52104d96f6 /drivers/staging/vt6655/device_main.c
parent70f38b105311c8e19a7fe89811d13ef81690072c (diff)
downloadop-kernel-dev-e882335bb19c0b9f96971fa6b1fe6c019280056b.zip
op-kernel-dev-e882335bb19c0b9f96971fa6b1fe6c019280056b.tar.gz
Staging: vt665x: depend on WIRELESS_EXT
Make vt665x depended on WIRELESS_EXT and remove remain ifdef's Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/device_main.c')
-rw-r--r--drivers/staging/vt6655/device_main.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 8846026..8800286 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1146,9 +1146,7 @@ device_found1(struct pci_dev *pcid, const struct pci_device_id *ent)
dev->irq = pcid->irq;
dev->netdev_ops = &device_netdev_ops;
-#ifdef CONFIG_WIRELESS_EXT
dev->wireless_handlers = (struct iw_handler_def *)&iwctl_handler_def;
-#endif
rc = register_netdev(dev);
if (rc)
@@ -3396,10 +3394,8 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
PSDevice pDevice = (PSDevice)netdev_priv(dev);
#endif
-#ifdef WIRELESS_EXT
struct iwreq *wrq = (struct iwreq *) rq;
int rc =0;
-#endif
PSMgmtObject pMgmt = pDevice->pMgmt;
PSCmdRequest pReq;
@@ -3411,8 +3407,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
switch(cmd) {
-#ifdef WIRELESS_EXT
-
case SIOCGIWNAME:
rc = iwctl_giwname(dev, NULL, (char *)&(wrq->u.name), NULL);
break;
@@ -3751,8 +3745,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
//End Add -- //2008-0409-07, <Add> by Einsn Liu
-#endif // WIRELESS_EXT
-
case IOCTL_CMD_TEST:
if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {
OpenPOWER on IntegriCloud