From: Malcolm Priestley Date: Wed, 5 Nov 2014 21:08:54 +0000 (+0000) Subject: staging: vt6655: device_set_options remove unused ethernet addresses X-Git-Tag: v3.19-rc1~66^2~423 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ac875c17a12141fb2845be3112b6905dd41862fa;p=karo-tx-linux.git staging: vt6655: device_set_options remove unused ethernet addresses Removing these variables abyBroadcastAddr abySNAP_RFC1042 abySNAP_Bridgetunnel Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 2f52297724d2..05f2993f1081 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -440,9 +440,6 @@ struct vnt_private { unsigned long uNumSQ3[MAX_RATE]; unsigned short wAntDiversityMaxRate; - unsigned char abyBroadcastAddr[ETH_ALEN]; - unsigned char abySNAP_RFC1042[ETH_ALEN]; - unsigned char abySNAP_Bridgetunnel[ETH_ALEN]; unsigned char abyEEPROM[EEP_MAX_CONTEXT_SIZE]; /* unsigned long alignment */ /* for 802.11h */ diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index e3b2d8fb1f6f..adcd6c804c25 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -222,14 +222,6 @@ static void device_get_options(struct vnt_private *pDevice) static void device_set_options(struct vnt_private *pDevice) { - unsigned char abyBroadcastAddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - unsigned char abySNAP_RFC1042[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00}; - unsigned char abySNAP_Bridgetunnel[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8}; - - ether_addr_copy(pDevice->abyBroadcastAddr, abyBroadcastAddr); - ether_addr_copy(pDevice->abySNAP_RFC1042, abySNAP_RFC1042); - ether_addr_copy(pDevice->abySNAP_Bridgetunnel, abySNAP_Bridgetunnel); - pDevice->byShortRetryLimit = pDevice->sOpts.short_retry; pDevice->byLongRetryLimit = pDevice->sOpts.long_retry; pDevice->bDiversityRegCtlON = (pDevice->sOpts.flags & DEVICE_FLAGS_DiversityANT) ? 1 : 0;