From: Mike McCormack Date: Mon, 31 Jan 2011 13:11:15 +0000 (+0900) Subject: Staging: rtl8192e: Remove unused card type X-Git-Tag: firefly_0821_release~7613^2~2197^2~745 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=51da8e2b4e0e4b14e5ec0fd32473dcfc2562b822;p=firefly-linux-kernel-4.4.55.git Staging: rtl8192e: Remove unused card type Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/ieee80211.h b/drivers/staging/rtl8192e/ieee80211.h index 16298e052667..ffa4d7bd1105 100644 --- a/drivers/staging/rtl8192e/ieee80211.h +++ b/drivers/staging/rtl8192e/ieee80211.h @@ -868,7 +868,6 @@ struct ieee80211_rx_stats { u16 len; u64 tsf; u32 beacon_time; - u8 nic_type; u16 Length; // u8 DataRate; // In 0.5 Mbps u8 SignalQuality; // in 0-100 index. diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h index a63a2a5633f9..515f492b214d 100644 --- a/drivers/staging/rtl8192e/r8192E.h +++ b/drivers/staging/rtl8192e/r8192E.h @@ -814,7 +814,6 @@ typedef struct r8192_priv #endif bool being_init_adapter; u8 Rf_Mode; - short card_8192; /* O: rtl8192, 1:rtl8185 V B/C, 2:rtl8185 V D */ u8 card_8192_version; /* if TCR reports card V B/C this discriminates */ spinlock_t irq_th_lock; spinlock_t tx_lock; @@ -1051,10 +1050,6 @@ typedef struct r8192_priv struct workqueue_struct *priv_wq; }r8192_priv; -typedef enum{ - NIC_8192E = 1, -} nic_t; - bool init_firmware(struct net_device *dev); short rtl8192_tx(struct net_device *dev, struct sk_buff* skb); u32 read_cam(struct net_device *dev, u8 addr); diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index 13158fa33769..2c17b57aac8f 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -2086,7 +2086,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->rxbuffersize = 9100;//2048;//1024; priv->rxringcount = MAX_RX_COUNT;//64; priv->irq_enabled=0; - priv->card_8192 = NIC_8192E; priv->rx_skb_complete = 1; priv->chan = 1; //set to channel 1 priv->RegWirelessMode = WIRELESS_MODE_AUTO; @@ -5369,8 +5368,6 @@ static void rtl8192_rx(struct net_device *dev) }; unsigned int count = priv->rxringcount; - stats.nic_type = NIC_8192E; - while (count--) { rx_desc_819x_pci *pdesc = &priv->rx_ring[priv->rx_idx];//rx descriptor struct sk_buff *skb = priv->rx_buf[priv->rx_idx];//rx pkt