From 2ee1ad7b3289d64f98da883adc68d4bf4599937b Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Wed, 5 Nov 2014 21:08:57 +0000 Subject: [PATCH] staging: vt6655: device_set_options remove dead variables uConnectionRate wRTSThreshold byOpMode b11hEnable uChannel Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device.h | 8 -------- drivers/staging/vt6655/device_main.c | 5 ----- 2 files changed, 13 deletions(-) diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 05f2993f1081..74d2afbdc9f1 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -335,17 +335,14 @@ struct vnt_private { unsigned char byMinChannel; unsigned char byMaxChannel; - unsigned int uConnectionRate; unsigned char byPreambleType; unsigned char byShortPreamble; unsigned short wCurrentRate; - unsigned short wRTSThreshold; unsigned char byShortRetryLimit; unsigned char byLongRetryLimit; enum nl80211_iftype op_mode; - unsigned char byOpMode; bool bBSSIDFilter; unsigned short wMaxTransmitMSDULifetime; @@ -442,13 +439,8 @@ struct vnt_private { unsigned char abyEEPROM[EEP_MAX_CONTEXT_SIZE]; /* unsigned long alignment */ - /* for 802.11h */ - bool b11hEnable; - unsigned short wBeaconInterval; - unsigned int uChannel; - struct iw_statistics wstats; /* wireless stats */ }; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 4744cf382914..00eb89a27925 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -231,16 +231,11 @@ device_set_options(struct vnt_private *pDevice) pDevice->bUpdateBBVGA = true; pDevice->byPreambleType = 0; - pr_debug(" uChannel= %d\n", (int)pDevice->uChannel); - pr_debug(" byOpMode= %d\n", (int)pDevice->byOpMode); - pr_debug(" wRTSThreshold= %d\n", (int)pDevice->wRTSThreshold); pr_debug(" byShortRetryLimit= %d\n", (int)pDevice->byShortRetryLimit); pr_debug(" byLongRetryLimit= %d\n", (int)pDevice->byLongRetryLimit); pr_debug(" byPreambleType= %d\n", (int)pDevice->byPreambleType); pr_debug(" byShortPreamble= %d\n", (int)pDevice->byShortPreamble); - pr_debug(" uConnectionRate= %d\n", (int)pDevice->uConnectionRate); pr_debug(" byBBType= %d\n", (int)pDevice->byBBType); - pr_debug(" pDevice->b11hEnable= %d\n", (int)pDevice->b11hEnable); pr_debug(" pDevice->bDiversityRegCtlON= %d\n", (int)pDevice->bDiversityRegCtlON); }