From 484a5df4a7a1c339e37f16a75714b22241722cf0 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Thu, 25 Sep 2003 11:28:54 -0400
Subject: [PATCH] [PATCH] (7/8) arlan -- more dead wood removal

Still more driver data which was updated but never used.
---
 drivers/net/wireless/arlan-main.c |  6 ------
 drivers/net/wireless/arlan.h      | 12 ++----------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index db7259a088cb2..5a591a3b7f5ba 100644
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -411,7 +411,6 @@ int arlan_command(struct net_device *dev, int command_p)
 				WRITESHMB(arlan->commandByte, ARLAN_COM_TX_ENABLE | ARLAN_COM_INT);
 				memcpy_toio((void *) arlan->commandParameter, &TXLAST(dev), 14);
 //				for ( i=1 ; i < 15 ; i++) printk("%02x:",READSHMB(arlan->commandParameter[i]));
-				priv->last_command_was_rx = 0;
 				priv->tx_last_sent = jiffies;
 				arlan_interrupt_lancpu(dev);
 				priv->last_tx_time = arlan_time();
@@ -765,7 +764,6 @@ static int arlan_hw_tx(struct net_device *dev, char *buf, int length)
 
 	arlan_command(dev, ARLAN_COMMAND_TX);
 
-	priv->last_command_was_rx = 0;
 	priv->tx_last_sent = jiffies;
 
 	IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk("%s TX Qued %d bytes \n", dev->name, length);
@@ -1233,7 +1231,6 @@ static int arlan_open(struct net_device *dev)
 	priv->rx_command_given = 0;
 	
 	priv->reRegisterExp = 1;
-	priv->last_command_was_rx = 0;
 	priv->tx_last_sent = jiffies - 1;
 	priv->tx_last_cleared = jiffies;
 	priv->Conf->writeEEPROM = 0;
@@ -1680,7 +1677,6 @@ static void arlan_process_interrupt(struct net_device *dev)
 
 		if (rxStatus == 0 && txStatus == 0)
 		{
-			priv->last_command_was_rx = 0;
 			if (priv->irq_test_done)
 			{
 				if (!registrationBad(dev))
@@ -1707,7 +1703,6 @@ static void arlan_process_interrupt(struct net_device *dev)
 		}
 		if (rxStatus > 2 && rxStatus < 0xff)
 		{
-			priv->last_command_was_rx = 0;
 			WRITESHMB(arlan->rxStatus, 0x00);
 			printk(KERN_ERR "%s unknown rxStatus reason tx %d rx %d ",
 				dev->name, txStatus, rxStatus);
@@ -1715,7 +1710,6 @@ static void arlan_process_interrupt(struct net_device *dev)
 		}
 		if (rxStatus == 0xff)
 		{
-			priv->last_command_was_rx = 0;
 			WRITESHMB(arlan->rxStatus, 0x00);
 			arlan_command(dev, ARLAN_COMMAND_RX);
 			if (registrationBad(dev))
diff --git a/drivers/net/wireless/arlan.h b/drivers/net/wireless/arlan.h
index 287fd449845e5..bc3bfc2014b6b 100644
--- a/drivers/net/wireless/arlan.h
+++ b/drivers/net/wireless/arlan.h
@@ -337,10 +337,7 @@ struct arlan_private {
       struct net_device_stats stats;
       struct arlan_shmem * card;
       struct arlan_shmem * conf;
-      struct TxParam txParam;      
-      int multicastLength;
-      char  multicastList[ARLAN_MAX_MULTICAST_ADDRS][6];
-      int promiscModeEnabled;
+
       struct arlan_conf_stru * Conf;	     
       int	bad;
       int 	reset;
@@ -353,16 +350,13 @@ struct arlan_private {
       int registrationLostCount;
       int reRegisterExp;
       int irq_test_done;
-      int last_command_was_rx;
+
       struct TxParam txRing[TX_RING_SIZE];
       char reTransmitBuff[0x800];
       volatile int txLast;
-      volatile int txNew;
       volatile char ReTransmitRequested;
       volatile unsigned long tx_done_delayed;
       volatile long long registrationLastSeen;
-      volatile char under_command;
-      volatile char under_toggle;
       volatile long long tx_last_sent;
       volatile long long tx_last_cleared;
       volatile int 	retransmissions;
@@ -477,13 +471,11 @@ struct arlan_private {
 #define arlan_interrupt_lancpu(dev) {\
    int cr;   \
    \
-   priv->under_toggle++;   \
    cr = readControlRegister(dev);\
    if (cr & ARLAN_CHANNEL_ATTENTION){ \
       writeControlRegister(dev, (cr & ~ARLAN_CHANNEL_ATTENTION));\
    }else  \
       writeControlRegister(dev, (cr | ARLAN_CHANNEL_ATTENTION));\
-   priv->under_toggle=0;     \
 }
 
 #define clearChannelAttention(dev){ \
-- 
2.53.0