Commit 51da8e2b authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192e: Remove unused card type 



Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 16940273

drivers/staging/rtl8192e/ieee80211.h

+0 −1
Original line number Diff line number Diff line
@@ -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.

drivers/staging/rtl8192e/r8192E.h

+0 −5
Original line number Diff line number Diff line
@@ -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);

drivers/staging/rtl8192e/r8192E_core.c

+0 −3
Original line number Diff line number Diff line
@@ -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